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

diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index 295dc15..f635a17 100644
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.java
@@ -2,11 +2,12 @@ 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;
 
@@ -14,7 +15,9 @@ 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;
+import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.Image;
+import be.nikiroo.utils.Progress;
 
 /**
  * Support class for CBZ files (works better with CBZ created with this program,
@@ -44,14 +47,13 @@ class Cbz extends Epub {
 	}
 
 	@Override
-	protected boolean getCover() {
-		return false;
+	protected boolean isImagesDocumentByDefault() {
+		return true;
 	}
 
 	@Override
-	protected void preprocess(URL source, InputStream in) throws IOException {
-		super.preprocess(source, in);
-		meta.setImageDocument(true);
+	protected boolean getCover() {
+		return false;
 	}
 
 	@Override
@@ -62,52 +64,99 @@ class Cbz extends Epub {
 			pg.setMinMax(0, 100);
 		}
 
-		Story story = processMeta(url, false, true);
-		story.setChapters(new ArrayList<Chapter>());
-		Chapter chap = new Chapter(1, null);
-		story.getChapters().add(chap);
-
-		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()
-					&& entry.getName().startsWith(getDataPrefix())) {
-				String entryLName = entry.getName().toLowerCase();
-				boolean imageEntry = false;
-				for (String ext : getImageExt(false)) {
-					if (entryLName.endsWith(ext)) {
-						imageEntry = true;
+		Progress pgMeta = new Progress();
+		pg.addProgress(pgMeta, 10);
+		Story story = processMeta(url, false, true, pgMeta);
+		pgMeta.done(); // 10%
+
+		File tmpDir = Instance.getTempFiles().createTempDir("info-text");
+		String basename = null;
+
+		Map<String, Image> images = new HashMap<String, Image>();
+		try {
+			ZipInputStream zipIn = new ZipInputStream(getInput());
+			for (ZipEntry entry = zipIn.getNextEntry(); entry != null; entry = zipIn
+					.getNextEntry()) {
+				if (!entry.isDirectory()
+						&& entry.getName().startsWith(getDataPrefix())) {
+					String entryLName = entry.getName().toLowerCase();
+					boolean imageEntry = false;
+					for (String ext : 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);
+						}
+
+						if (pg.getProgress() < 85) {
+							pg.add(1);
+						}
+					} else if (entryLName.endsWith(".info")) {
+						basename = entryLName.substring(0, entryLName.length()
+								- ".info".length());
+						IOUtils.write(zipIn, new File(tmpDir, entryLName));
+					} else if (entryLName.endsWith(".txt")) {
+						IOUtils.write(zipIn, new File(tmpDir, entryLName));
 					}
 				}
+			}
+
+			pg.setProgress(85);
+
+			// ZIP order is not correct for us
+			List<String> imagesList = new ArrayList<String>(images.keySet());
+			Collections.sort(imagesList);
 
-				if (imageEntry) {
-					String uuid = meta.getUuid() + "_" + entry.getName();
-					images.add(uuid);
+			pg.setProgress(90);
+
+			File txt = new File(tmpDir, basename + ".txt");
+			if (!txt.exists()) {
+				basename = null;
+			}
+			if (basename != null) {
+				try {
+					BasicSupport support = BasicSupport.getSupport(txt.toURI()
+							.toURL());
+					Story origStory = support.process(null);
+					story.setChapters(origStory.getChapters());
+					story.setMeta(origStory.getMeta());
+				} catch (Exception e) {
+					basename = null;
+				}
+			}
+
+			if (basename == null) {
+				story.setChapters(new ArrayList<Chapter>());
+			}
+
+			if (!imagesList.isEmpty()) {
+				Chapter chap = new Chapter(story.getChapters().size() + 1, null);
+				story.getChapters().add(chap);
+
+				for (String uuid : imagesList) {
 					try {
-						Instance.getCache().addToCache(zipIn, uuid);
+						chap.getParagraphs().add(
+								new Paragraph(images.get(uuid)));
 					} catch (Exception e) {
-						Instance.syserr(e);
+						Instance.getTraceHandler().error(e);
 					}
 				}
 			}
-		}
-
-		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);
+			if (meta.getCover() == null && !images.isEmpty()) {
+				meta.setCover(images.get(imagesList.get(0)));
+				meta.setFakeCover(true);
 			}
+
+		} finally {
+			IOUtils.deltree(tmpDir);
 		}
 
 		pg.setProgress(100);