X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FCbz.java;h=3da65ee728406b0cc21c3e69c425601d700f109e;hb=654e27bb90879440335f265b69e2a3a5fb085eb2;hp=3b90769ceb76bd5e340df0f4102c48c89428ec01;hpb=27694a1373c09fa3f2634dfaec4cc944dff3ea5f;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index 3b90769..3da65ee 100644
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.java
@@ -17,10 +17,11 @@ 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.streams.MarkableFileInputStream;
 import be.nikiroo.utils.Progress;
 
 /**
@@ -35,11 +36,6 @@ class Cbz extends Epub {
 		return url.toString().toLowerCase().endsWith(".cbz");
 	}
 
-	@Override
-	public String getSourceName() {
-		return "cbz";
-	}
-
 	@Override
 	protected String getDataPrefix() {
 		return "";
@@ -72,8 +68,6 @@ class Cbz extends Epub {
 		pg.addProgress(pgMeta, 10);
 		Story story = processMeta(true, pgMeta);
 		MetaData meta = story.getMeta();
-		
-System.out.println("Meta from Cbz support: "+meta);
 
 		pgMeta.done(); // 10%
 
@@ -84,8 +78,7 @@ System.out.println("Meta from Cbz support: "+meta);
 		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()) {
@@ -128,16 +121,39 @@ System.out.println("Meta from Cbz support: "+meta);
 
 			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()) {
@@ -158,8 +174,6 @@ System.out.println("Meta from Cbz support: "+meta);
 				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) {