back to dev

[nikiroo-utils.git] / src / be / nikiroo / fanfix / supported / Cbz.java

diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index 948a2d65ece471813f79af289f59b38a49fb8fec..3aaa355b7b0827015e8334af7362f56c2bdc966d 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.java
@@ -126,14 +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);
@@ -153,7 +154,6 @@ class Cbz extends Epub {
                                meta.setCover(images.get(imagesList.get(0)));
                                meta.setFakeCover(true);
                        }
-
                } finally {
                        IOUtils.deltree(tmpDir);
                        if (zipIn != null) {