X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FCbz.java;h=3aaa355b7b0827015e8334af7362f56c2bdc966d;hb=f43598131014c6a1db57e885cc0ac21605633e9d;hp=1cf07c5d0f162c0f300e4a389c0a6282819e7c99;hpb=e5714913b0f4611e4d5a8dd8ed1b4d204ecc81ee;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java index 1cf07c5..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); @@ -156,8 +154,6 @@ class Cbz extends Epub { 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) {