From: Niki Roo <niki@nikiroo.be>
Date: Tue, 9 Apr 2019 06:27:00 +0000 (+0200)
Subject: cbz_hybrid support (text+images)
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=e5a2f1b3d64907292ef59c6eae076354510e8641;p=fanfix-jexer.git

cbz_hybrid support (text+images)
---

diff --git a/src/be/nikiroo/fanfix/data/Paragraph.java b/src/be/nikiroo/fanfix/data/Paragraph.java
index e7ef045..0ed61fb 100644
--- a/src/be/nikiroo/fanfix/data/Paragraph.java
+++ b/src/be/nikiroo/fanfix/data/Paragraph.java
@@ -23,7 +23,19 @@ public class Paragraph implements Cloneable {
 		/** Quotation (dialogue) */
 		QUOTE,
 		/** An image (no text) */
-		IMAGE,
+		IMAGE, ;
+
+		/**
+		 * This paragraph type is of a text kind (quote or not).
+		 * 
+		 * @param allowEmpty
+		 *            allow empty text as text, too (blanks, breaks...)
+		 * @return TRUE if it is
+		 */
+		public boolean isText(boolean allowEmpty) {
+			return (this == NORMAL || this == QUOTE)
+					|| (allowEmpty && (this == BLANK || this == BREAK));
+		}
 	}
 
 	private ParagraphType type;
diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index 3aaa355..062adf0 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;
@@ -126,7 +127,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 +137,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);