X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FEpub.java;h=ae26574340c58cc9e19d54889f70fb77dadf272a;hb=67837328c9ded45b23691e2a3ebdb29c75f157f2;hp=356e3a88fcbdb9d43905a5c6717ed10c62309cb1;hpb=bb7021f2b3f1bf32d6ec7ad521ae7ae8d1810c57;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/supported/Epub.java b/src/be/nikiroo/fanfix/supported/Epub.java index 356e3a8..ae26574 100644 --- a/src/be/nikiroo/fanfix/supported/Epub.java +++ b/src/be/nikiroo/fanfix/supported/Epub.java @@ -17,7 +17,7 @@ import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.data.MetaData; import be.nikiroo.utils.IOUtils; import be.nikiroo.utils.Image; -import be.nikiroo.utils.MarkableFileInputStream; +import be.nikiroo.utils.streams.MarkableFileInputStream; import be.nikiroo.utils.StringUtils; /** @@ -34,11 +34,6 @@ class Epub extends InfoText { private URL fakeSource; private InputStream fakeIn; - @Override - public String getSourceName() { - return "epub"; - } - public File getSourceFileOriginal() { return super.getSourceFile(); } @@ -179,8 +174,7 @@ class Epub extends InfoText { } if (tmp.exists()) { - this.fakeIn = new MarkableFileInputStream(new FileInputStream( - tmp)); + this.fakeIn = new MarkableFileInputStream(tmp); } if (tmpInfo.exists()) { @@ -198,7 +192,7 @@ class Epub extends InfoText { meta = new MetaData(); meta.setLang("en"); meta.setTags(new ArrayList()); - meta.setSource(getSourceName()); + meta.setSource(getType().getSourceName()); meta.setUuid(url); meta.setUrl(url); meta.setTitle(title); @@ -210,7 +204,6 @@ class Epub extends InfoText { if (cover != null) { meta.setCover(cover); } else { -System.out.println(">>> " + getSourceFileOriginal()); meta.setCover(InfoReader .getCoverByName(getSourceFileOriginal().toURI() .toURL()));