X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FEpub.java;h=ce9bd06f7a7b15efc358fac017b1313cc03763ed;hb=276f95c6ca9a79d2fc6879877b240cefb4ceb598;hp=b8c4af073805e5be8866213d4036936696bb334d;hpb=778d8d85f288c7b67c1a5156e5aedfc944997be0;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/supported/Epub.java b/src/be/nikiroo/fanfix/supported/Epub.java
index b8c4af0..ce9bd06 100644
--- a/src/be/nikiroo/fanfix/supported/Epub.java
+++ b/src/be/nikiroo/fanfix/supported/Epub.java
@@ -1,6 +1,5 @@
 package be.nikiroo.fanfix.supported;
 
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -16,7 +15,7 @@ import java.util.zip.ZipInputStream;
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.utils.IOUtils;
-import be.nikiroo.utils.ImageUtils;
+import be.nikiroo.utils.Image;
 import be.nikiroo.utils.MarkableFileInputStream;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.StringUtils;
@@ -97,7 +96,7 @@ class Epub extends InfoText {
 		tmp = File.createTempFile("fanfic-reader-parser_", ".tmp");
 		File tmpInfo = new File(tmp + ".info");
 		fakeSource = tmp.toURI().toURL();
-		BufferedImage cover = null;
+		Image cover = null;
 
 		String url = source.toString();
 		String title = null;
@@ -126,9 +125,9 @@ class Epub extends InfoText {
 					// Cover
 					if (getCover()) {
 						try {
-							cover = ImageUtils.fromStream(zipIn);
+							cover = new Image(zipIn);
 						} catch (Exception e) {
-							Instance.syserr(e);
+							Instance.getTraceHandler().error(e);
 						}
 					}
 				} else if (entry.getName().equals(getDataPrefix() + "URL")) {
@@ -190,18 +189,19 @@ class Epub extends InfoText {
 			}
 
 			meta = new MetaData();
-			meta.setLang("EN");
+			meta.setLang("en");
 			meta.setTags(new ArrayList<String>());
 			meta.setSource(getSourceName());
 			meta.setUuid(url);
 			meta.setUrl(url);
 			meta.setTitle(title);
 			meta.setAuthor(author);
+			meta.setImageDocument(isImagesDocumentByDefault());
 		}
 	}
 
 	@Override
-	protected void close() throws IOException {
+	protected void close() {
 		if (tmp != null && tmp.exists()) {
 			if (!tmp.delete()) {
 				tmp.deleteOnExit();
@@ -211,7 +211,11 @@ class Epub extends InfoText {
 		tmp = null;
 
 		if (fakeIn != null) {
-			fakeIn.close();
+			try {
+				fakeIn.close();
+			} catch (Exception e) {
+				Instance.getTraceHandler().error(e);
+			}
 		}
 
 		super.close();
@@ -228,4 +232,8 @@ class Epub extends InfoText {
 	protected boolean getCover() {
 		return true;
 	}
+
+	protected boolean isImagesDocumentByDefault() {
+		return false;
+	}
 }