X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FCbz.java;h=76b66aba7c75fa24317eb4daca6ff75854658326;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=3da65ee728406b0cc21c3e69c425601d700f109e;hpb=654e27bb90879440335f265b69e2a3a5fb085eb2;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index 3da65ee..76b66ab 100644
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.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.URL;
@@ -14,6 +13,7 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 import be.nikiroo.fanfix.Instance;
+import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Paragraph;
@@ -21,8 +21,8 @@ import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.Image;
-import be.nikiroo.utils.streams.MarkableFileInputStream;
 import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.streams.MarkableFileInputStream;
 
 /**
  * Support class for CBZ files (works better with CBZ created with this program,
@@ -71,7 +71,7 @@ class Cbz extends Epub {
 
 		pgMeta.done(); // 10%
 
-		File tmpDir = Instance.getTempFiles().createTempDir("info-text");
+		File tmpDir = Instance.getInstance().getTempFiles().createTempDir("info-text");
 		String basename = null;
 
 		Map<String, Image> images = new HashMap<String, Image>();
@@ -86,18 +86,18 @@ class Cbz extends Epub {
 						&& entry.getName().startsWith(getDataPrefix())) {
 					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;
 						}
 					}
-
+					
 					if (imageEntry) {
 						String uuid = meta.getUuid() + "_" + entry.getName();
 						try {
 							images.put(uuid, new Image(zipIn));
 						} catch (Exception e) {
-							Instance.getTraceHandler().error(e);
+							Instance.getInstance().getTraceHandler().error(e);
 						}
 
 						if (pg.getProgress() < 85) {
@@ -112,6 +112,12 @@ class Cbz extends Epub {
 					}
 				}
 			}
+			
+			String ext = "."
+					+ Instance.getInstance().getConfig().getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER).toLowerCase();
+			String coverName = meta.getUuid() + "_" + basename + ext;
+			Image cover = images.get(coverName);
+			images.remove(coverName);
 
 			pg.setProgress(85);
 
@@ -121,7 +127,7 @@ class Cbz extends Epub {
 
 			pg.setProgress(90);
 
-			// only the description is kept
+			// only the description/cover is kept
 			Story origStory = getStoryFromTxt(tmpDir, basename);
 			if (origStory != null) {
 				if (origStory.getMeta().getCover() == null) {
@@ -129,6 +135,9 @@ class Cbz extends Epub {
 				}
 				story.setMeta(origStory.getMeta());
 			}
+			if (story.getMeta().getCover() == null) {
+				story.getMeta().setCover(cover);
+			}
 			story.setChapters(new ArrayList<Chapter>());
 
 			// Check if we can find non-images chapters, for hybrid-cbz support
@@ -165,7 +174,7 @@ class Cbz extends Epub {
 						chap.getParagraphs().add(
 								new Paragraph(images.get(uuid)));
 					} catch (Exception e) {
-						Instance.getTraceHandler().error(e);
+						Instance.getInstance().getTraceHandler().error(e);
 					}
 				}
 			}