X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FCbz.java;h=b6524acac90fbb16d3ffd6e7621c84c4f518883a;hb=16a81ef7656c5c692fb831927e75edde25dd77a0;hp=f9eee08d51428cab98f2c3fbe9b6561cd3087f56;hpb=68686a37a591a767f6d1af428ea0d5f3d3a1ddc1;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index f9eee08..b6524ac 100644
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.java
@@ -1,10 +1,13 @@
 package be.nikiroo.fanfix.supported;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -12,6 +15,8 @@ import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.utils.Image;
+import be.nikiroo.utils.Progress;
 
 /**
  * Support class for CBZ files (works better with CBZ created with this program,
@@ -52,14 +57,25 @@ class Cbz extends Epub {
 	}
 
 	@Override
-	public Story process(URL url) throws IOException {
-		Story story = processMeta(url, false, true);
+	public Story process(URL url, Progress pg) throws IOException {
+		if (pg == null) {
+			pg = new Progress();
+		} else {
+			pg.setMinMax(0, 100);
+		}
+
+		Progress pgMeta = new Progress();
+		pg.addProgress(pgMeta, 10);
+		Story story = processMeta(url, false, true, pgMeta);
+		pgMeta.done(); // 10%
+
 		story.setChapters(new ArrayList<Chapter>());
 		Chapter chap = new Chapter(1, null);
 		story.getChapters().add(chap);
 
 		ZipInputStream zipIn = new ZipInputStream(getInput());
 
+		Map<String, Image> images = new HashMap<String, Image>();
 		for (ZipEntry entry = zipIn.getNextEntry(); entry != null; entry = zipIn
 				.getNextEntry()) {
 			if (!entry.isDirectory()
@@ -73,19 +89,42 @@ class Cbz extends Epub {
 				}
 
 				if (imageEntry) {
+					String uuid = meta.getUuid() + "_" + entry.getName();
 					try {
-						String uuid = meta.getUuid() + "_" + entry.getName();
-
-						Instance.getCache().addToCache(zipIn, uuid);
-						chap.getParagraphs().add(
-								new Paragraph(new File(uuid).toURI().toURL()));
+						images.put(uuid, new Image(zipIn));
 					} catch (Exception e) {
-						Instance.syserr(e);
+						Instance.getTraceHandler().error(e);
+					}
+
+					if (pg.getProgress() < 85) {
+						pg.add(1);
 					}
 				}
 			}
 		}
 
+		pg.setProgress(85);
+
+		// ZIP order is not correct for us
+		List<String> imagesList = new ArrayList<String>(images.keySet());
+		Collections.sort(imagesList);
+
+		pg.setProgress(90);
+
+		for (String uuid : imagesList) {
+			try {
+				chap.getParagraphs().add(new Paragraph(images.get(uuid)));
+			} catch (Exception e) {
+				Instance.getTraceHandler().error(e);
+			}
+		}
+
+		if (meta.getCover() == null && !images.isEmpty()) {
+			meta.setCover(images.get(imagesList.get(0)));
+			meta.setFakeCover(true);
+		}
+
+		pg.setProgress(100);
 		return story;
 	}
 }