From 091397cbbd3414ebb172d0bc9428d9ddf65352dd Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Tue, 26 Mar 2019 18:40:12 +0100 Subject: [PATCH] cbz: fix support to discard story --- src/be/nikiroo/fanfix/supported/Cbz.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java index 6fadad7..3aaa355 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()); } + story.setChapters(new ArrayList()); if (!imagesList.isEmpty()) { Chapter chap = new Chapter(story.getChapters().size() + 1, null); -- 2.27.0