X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FEpub.java;h=f8e467831381185244eae24b15d3a96a6cb0f6cb;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=7ac3efc78703f7fb9e4a27fc2668c04c541965ad;hpb=4ec79417fe5bd4344ac12b39ac8c98db8f9276f6;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/supported/Epub.java b/src/be/nikiroo/fanfix/supported/Epub.java
index 7ac3efc..f8e4678 100644
--- a/src/be/nikiroo/fanfix/supported/Epub.java
+++ b/src/be/nikiroo/fanfix/supported/Epub.java
@@ -1,7 +1,6 @@
 package be.nikiroo.fanfix.supported;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;
@@ -17,8 +16,8 @@ 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.StringUtils;
+import be.nikiroo.utils.streams.MarkableFileInputStream;
 
 /**
  * Support class for EPUB files created with this program (as we need some
@@ -27,8 +26,6 @@ import be.nikiroo.utils.StringUtils;
  * @author niki
  */
 class Epub extends InfoText {
-	private File sourceFileOriginal;
-
 	private MetaData meta;
 	private File tmpDir;
 	private String desc;
@@ -36,13 +33,8 @@ class Epub extends InfoText {
 	private URL fakeSource;
 	private InputStream fakeIn;
 
-	@Override
-	public String getSourceName() {
-		return "epub";
-	}
-
 	public File getSourceFileOriginal() {
-		return sourceFileOriginal;
+		return super.getSourceFile();
 	}
 
 	@Override
@@ -50,10 +42,8 @@ class Epub extends InfoText {
 		try {
 			return new File(fakeSource.toURI());
 		} catch (URISyntaxException e) {
-			Instance.getTraceHandler()
-					.error(new IOException(
-							"Cannot get the source file from the info-text URL",
-							e));
+			Instance.getInstance().getTraceHandler()
+					.error(new IOException("Cannot get the source file from the info-text URL", e));
 		}
 
 		return null;
@@ -61,7 +51,17 @@ class Epub extends InfoText {
 
 	@Override
 	protected InputStream getInput() {
-		return fakeIn;
+		if (fakeIn != null) {
+			try {
+				fakeIn.reset();
+			} catch (IOException e) {
+				Instance.getInstance().getTraceHandler().error(new IOException("Cannot reset the Epub Text stream", e));
+			}
+
+			return fakeIn;
+		}
+
+		return null;
 	}
 
 	@Override
@@ -83,8 +83,7 @@ class Epub extends InfoText {
 		ZipInputStream zipIn = null;
 		try {
 			zipIn = new ZipInputStream(in);
-			tmpDir = Instance.getTempFiles().createTempDir(
-					"fanfic-reader-parser");
+			tmpDir = Instance.getInstance().getTempFiles().createTempDir("fanfic-reader-parser");
 			File tmp = new File(tmpDir, "file.txt");
 			File tmpInfo = new File(tmpDir, "file.info");
 
@@ -107,7 +106,7 @@ class Epub extends InfoText {
 					String entryLName = entry.getName().toLowerCase();
 
 					boolean imageEntry = false;
-					for (String ext : BasicSupportImages.getImageExt(false)) {
+					for (String ext : bsImages.getImageExt(false)) {
 						if (entryLName.endsWith(ext)) {
 							imageEntry = true;
 						}
@@ -125,7 +124,7 @@ class Epub extends InfoText {
 							try {
 								cover = new Image(zipIn);
 							} catch (Exception e) {
-								Instance.getTraceHandler().error(e);
+								Instance.getInstance().getTraceHandler().error(e);
 							}
 						}
 					} else if (entry.getName().equals(getDataPrefix() + "URL")) {
@@ -169,15 +168,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()) {
@@ -191,13 +186,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();