X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FCbz.java;h=c7475fa775640e39f57aa8b1d218ab3cd51841b8;hp=1cf07c5d0f162c0f300e4a389c0a6282819e7c99;hb=8d59ce0748baeeea0458bab49716ab4543aae439;hpb=e5714913b0f4611e4d5a8dd8ed1b4d204ecc81ee

diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index 1cf07c5..c7475fa 100644
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.java
@@ -1,7 +1,6 @@
 package be.nikiroo.fanfix.supported;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -17,11 +16,12 @@ import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Paragraph;
+import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.Image;
-import be.nikiroo.utils.MarkableFileInputStream;
 import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.streams.MarkableFileInputStream;
 
 /**
  * Support class for CBZ files (works better with CBZ created with this program,
@@ -35,11 +35,6 @@ class Cbz extends Epub {
 		return url.toString().toLowerCase().endsWith(".cbz");
 	}
 
-	@Override
-	public String getSourceName() {
-		return "cbz";
-	}
-
 	@Override
 	protected String getDataPrefix() {
 		return "";
@@ -72,7 +67,7 @@ class Cbz extends Epub {
 		pg.addProgress(pgMeta, 10);
 		Story story = processMeta(true, pgMeta);
 		MetaData meta = story.getMeta();
-		
+
 		pgMeta.done(); // 10%
 
 		File tmpDir = Instance.getTempFiles().createTempDir("info-text");
@@ -82,8 +77,7 @@ class Cbz extends Epub {
 		InputStream cbzIn = null;
 		ZipInputStream zipIn = null;
 		try {
-			cbzIn = new MarkableFileInputStream(new FileInputStream(
-					getSourceFileOriginal()));
+			cbzIn = new MarkableFileInputStream(getSourceFileOriginal());
 			zipIn = new ZipInputStream(cbzIn);
 			for (ZipEntry entry = zipIn.getNextEntry(); entry != null; entry = zipIn
 					.getNextEntry()) {
@@ -91,7 +85,7 @@ class Cbz extends Epub {
 						&& entry.getName().startsWith(getDataPrefix())) {
 					String entryLName = entry.getName().toLowerCase();
 					boolean imageEntry = false;
-					for (String ext : BasicSupportImages.getImageExt(false)) {
+					for (String ext : bsImages.getImageExt(false)) {
 						if (entryLName.endsWith(ext)) {
 							imageEntry = true;
 						}
@@ -126,16 +120,39 @@ class Cbz extends Epub {
 
 			pg.setProgress(90);
 
-			// include original story
+			// only the description is kept
 			Story origStory = getStoryFromTxt(tmpDir, basename);
 			if (origStory != null) {
-				story.setChapters(origStory.getChapters());
 				if (origStory.getMeta().getCover() == null) {
 					origStory.getMeta().setCover(story.getMeta().getCover());
 				}
 				story.setMeta(origStory.getMeta());
-			} else {
-				story.setChapters(new ArrayList<Chapter>());
+			}
+			story.setChapters(new ArrayList<Chapter>());
+
+			// Check if we can find non-images chapters, for hybrid-cbz support
+			if (origStory != null) {
+				for (Chapter chap : origStory) {
+					Boolean isImages = null;
+					for (Paragraph para : chap) {
+						ParagraphType t = para.getType();
+						if (isImages == null && !t.isText(true)) {
+							isImages = true;
+						}
+						if (t.isText(false)) {
+							String line = para.getContent();
+							// Images are saved in text mode as "[image-link]"
+							if (!(line.startsWith("[") && line.endsWith("]"))) {
+								isImages = false;
+							}
+						}
+					}
+
+					if (isImages != null && !isImages) {
+						story.getChapters().add(chap);
+						chap.setNumber(story.getChapters().size());
+					}
+				}
 			}
 
 			if (!imagesList.isEmpty()) {
@@ -156,8 +173,6 @@ class Cbz extends Epub {
 				meta.setCover(images.get(imagesList.get(0)));
 				meta.setFakeCover(true);
 			}
-			
-System.out.println("Meta from Cbz support at end: "+meta);
 		} finally {
 			IOUtils.deltree(tmpDir);
 			if (zipIn != null) {