X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FEpub.java;h=ae26574340c58cc9e19d54889f70fb77dadf272a;hb=67837328c9ded45b23691e2a3ebdb29c75f157f2;hp=5a1fe43ce1e87929ee70e11e43c4d461f4ba3fc1;hpb=298d405a94bd30b67ce69add67bd7c764061def4;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/supported/Epub.java b/src/be/nikiroo/fanfix/supported/Epub.java
index 5a1fe43..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,15 +174,11 @@ class Epub extends InfoText {
 			}
 
 			if (tmp.exists()) {
-				this.fakeIn = new MarkableFileInputStream(new FileInputStream(
-						tmp));
+				this.fakeIn = new MarkableFileInputStream(tmp);
 			}
 
 			if (tmpInfo.exists()) {
 				meta = InfoReader.readMeta(tmpInfo, true);
-				if (cover != null) {
-					meta.setCover(cover);
-				}
 				tmpInfo.delete();
 			} else {
 				if (title == null || title.isEmpty()) {
@@ -201,13 +192,23 @@ class Epub extends InfoText {
 				meta = new MetaData();
 				meta.setLang("en");
 				meta.setTags(new ArrayList<String>());
-				meta.setSource(getSourceName());
+				meta.setSource(getType().getSourceName());
 				meta.setUuid(url);
 				meta.setUrl(url);
 				meta.setTitle(title);
 				meta.setAuthor(author);
 				meta.setImageDocument(isImagesDocumentByDefault());
 			}
+
+			if (meta.getCover() == null) {
+				if (cover != null) {
+					meta.setCover(cover);
+				} else {
+					meta.setCover(InfoReader
+							.getCoverByName(getSourceFileOriginal().toURI()
+									.toURL()));
+				}
+			}
 		} finally {
 			if (zipIn != null) {
 				zipIn.close();