X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FCbz.java;h=e1a766e32defd0a1945e3aeba53c0622b7e487a2;hb=727108fef9dcc661d45fa69ebf8b76f5128a2b6f;hp=3aaa355b7b0827015e8334af7362f56c2bdc966d;hpb=091397cbbd3414ebb172d0bc9428d9ddf65352dd;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index 3aaa355..e1a766e 100644
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.java
@@ -17,6 +17,7 @@ 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;
@@ -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 "";
@@ -126,7 +122,7 @@ class Cbz extends Epub {
 
 			pg.setProgress(90);
 
-			// only the description is kept, we do not support hybrid CBZ
+			// only the description is kept
 			Story origStory = getStoryFromTxt(tmpDir, basename);
 			if (origStory != null) {
 				if (origStory.getMeta().getCover() == null) {
@@ -136,6 +132,29 @@ class Cbz extends Epub {
 			}
 			story.setChapters(new ArrayList<Chapter>());
 
+			// Check if we can find non-images chapters, for hybrid-cbz support
+			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()) {
 				Chapter chap = new Chapter(story.getChapters().size() + 1, null);
 				story.getChapters().add(chap);