X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FCbz.java;h=b63ec5d45395c8a8529e1e20bcdfef8f267626e4;hb=3b2b638f7e1395702f843b5b19d7959327f604b2;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..b63ec5d 100644
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.java
@@ -5,6 +5,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -12,6 +14,7 @@ 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.Progress;
 
 /**
  * Support class for CBZ files (works better with CBZ created with this program,
@@ -52,7 +55,13 @@ class Cbz extends Epub {
 	}
 
 	@Override
-	public Story process(URL url) throws IOException {
+	public Story process(URL url, Progress pg) throws IOException {
+		if (pg == null) {
+			pg = new Progress();
+		} else {
+			pg.setMinMax(0, 100);
+		}
+
 		Story story = processMeta(url, false, true);
 		story.setChapters(new ArrayList<Chapter>());
 		Chapter chap = new Chapter(1, null);
@@ -60,6 +69,8 @@ class Cbz extends Epub {
 
 		ZipInputStream zipIn = new ZipInputStream(getInput());
 
+		pg.setProgress(10);
+		List<String> images = new ArrayList<String>();
 		for (ZipEntry entry = zipIn.getNextEntry(); entry != null; entry = zipIn
 				.getNextEntry()) {
 			if (!entry.isDirectory()
@@ -73,12 +84,10 @@ class Cbz extends Epub {
 				}
 
 				if (imageEntry) {
+					String uuid = meta.getUuid() + "_" + entry.getName();
+					images.add(uuid);
 					try {
-						String uuid = meta.getUuid() + "_" + entry.getName();
-
 						Instance.getCache().addToCache(zipIn, uuid);
-						chap.getParagraphs().add(
-								new Paragraph(new File(uuid).toURI().toURL()));
 					} catch (Exception e) {
 						Instance.syserr(e);
 					}
@@ -86,6 +95,22 @@ class Cbz extends Epub {
 			}
 		}
 
+		pg.setProgress(80);
+
+		// ZIP order is not sure
+		Collections.sort(images);
+		pg.setProgress(90);
+
+		for (String uuid : images) {
+			try {
+				chap.getParagraphs().add(
+						new Paragraph(new File(uuid).toURI().toURL()));
+			} catch (Exception e) {
+				Instance.syserr(e);
+			}
+		}
+
+		pg.setProgress(100);
 		return story;
 	}
 }