X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FCbz.java;h=295dc15a92ddc699792fdd4914c7a05f14056918;hp=012c0474a95df1a05cae162a9518e322f9099a80;hb=92fb0719f84f5b6734b51e528332546d78e9ccec;hpb=08fe2e33007063e30fe22dc1d290f8afaa18eb1d

diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index 012c047..295dc15 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.ui.Progress;
 
 /**
  * Support class for CBZ files (works better with CBZ created with this program,
@@ -39,12 +42,6 @@ class Cbz extends Epub {
 	protected boolean requireInfo() {
 		return false;
 	}
-	
-	@Override
-	public boolean isImageDocument(URL source, InputStream in)
-			throws IOException {
-		return true;
-	}
 
 	@Override
 	protected boolean getCover() {
@@ -52,7 +49,19 @@ class Cbz extends Epub {
 	}
 
 	@Override
-	public Story process(URL url) throws IOException {
+	protected void preprocess(URL source, InputStream in) throws IOException {
+		super.preprocess(source, in);
+		meta.setImageDocument(true);
+	}
+
+	@Override
+	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,14 +84,10 @@ class Cbz extends Epub {
 				}
 
 				if (imageEntry) {
+					String uuid = meta.getUuid() + "_" + entry.getName();
+					images.add(uuid);
 					try {
-						// we assume that we can get the UUID without a stream
-						String uuid = getUuid(url, null) + "_"
-								+ entry.getName();
-
 						Instance.getCache().addToCache(zipIn, uuid);
-						chap.getParagraphs().add(
-								new Paragraph(new File(uuid).toURI().toURL()));
 					} catch (Exception e) {
 						Instance.syserr(e);
 					}
@@ -88,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;
 	}
 }