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

diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index 012c047..1080ad2 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;
 
@@ -39,18 +41,18 @@ 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() {
 		return false;
 	}
 
+	@Override
+	protected void preprocess(URL source, InputStream in) throws IOException {
+		super.preprocess(source, in);
+		meta.setImageDocument(true);
+	}
+
 	@Override
 	public Story process(URL url) throws IOException {
 		Story story = processMeta(url, false, true);
@@ -60,6 +62,7 @@ class Cbz extends Epub {
 
 		ZipInputStream zipIn = new ZipInputStream(getInput());
 
+		List<String> images = new ArrayList<String>();
 		for (ZipEntry entry = zipIn.getNextEntry(); entry != null; entry = zipIn
 				.getNextEntry()) {
 			if (!entry.isDirectory()
@@ -73,14 +76,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 +87,18 @@ class Cbz extends Epub {
 			}
 		}
 
+		// ZIP order is not sure
+		Collections.sort(images);
+
+		for (String uuid : images) {
+			try {
+				chap.getParagraphs().add(
+						new Paragraph(new File(uuid).toURI().toURL()));
+			} catch (Exception e) {
+				Instance.syserr(e);
+			}
+		}
+
 		return story;
 	}
 }