From: Niki Roo <niki@nikiroo.be>
Date: Tue, 26 Mar 2019 17:40:12 +0000 (+0100)
Subject: cbz: fix support to discard story
X-Git-Tag: fanfix-swing-0.0.1~12^2~189
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=091397cbbd3414ebb172d0bc9428d9ddf65352dd;p=fanfix-swing.git

cbz: fix support to discard story
---

diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index 6fadad7c..3aaa355b 100644
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.java
@@ -72,7 +72,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");
@@ -126,17 +126,15 @@ class Cbz extends Epub {
 
 			pg.setProgress(90);
 
-			// include original story
+			// only the description is kept, we do not support hybrid CBZ
 			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>());
 
 			if (!imagesList.isEmpty()) {
 				Chapter chap = new Chapter(story.getChapters().size() + 1, null);