Fix CBZ: do not include the first page twice

[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 1080ad2755adebb174ad7a3e04f4053c9e0b35f4..7113248ba485fb4b91ad06f5b614cd49f1b7a3c7 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.java
@@ -1,5 +1,6 @@
 package be.nikiroo.fanfix.supported;
 
+import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -10,10 +11,13 @@ import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import javax.imageio.ImageIO;
+
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.utils.Progress;
 
 /**
  * Support class for CBZ files (works better with CBZ created with this program,
@@ -54,7 +58,13 @@ class Cbz extends Epub {
        }
 
        @Override
-       public Story process(URL url) throws IOException {
+       public Story process(URL url, Progress pg) throws IOException {
+               if (pg == null) {
+                       pg = new Progress();
+               } else {
+                       pg.setMinMax(0, 100);
+               }
+
                Story story = processMeta(url, false, true);
                story.setChapters(new ArrayList<Chapter>());
                Chapter chap = new Chapter(1, null);
@@ -62,6 +72,7 @@ class Cbz extends Epub {
 
                ZipInputStream zipIn = new ZipInputStream(getInput());
 
+               pg.setProgress(10);
                List<String> images = new ArrayList<String>();
                for (ZipEntry entry = zipIn.getNextEntry(); entry != null; entry = zipIn
                                .getNextEntry()) {
@@ -77,9 +88,9 @@ class Cbz extends Epub {
 
                                if (imageEntry) {
                                        String uuid = meta.getUuid() + "_" + entry.getName();
-                                       images.add(uuid);
                                        try {
-                                               Instance.getCache().addToCache(zipIn, uuid);
+                                               File tmp = Instance.getCache().addToCache(zipIn, uuid);
+                                               images.add(tmp.toURI().toURL().toString());
                                        } catch (Exception e) {
                                                Instance.syserr(e);
                                        }
@@ -87,18 +98,33 @@ class Cbz extends Epub {
                        }
                }
 
-               // ZIP order is not sure
+               pg.setProgress(80);
+
+               // ZIP order is not correct for us
                Collections.sort(images);
+               pg.setProgress(90);
 
                for (String uuid : images) {
                        try {
-                               chap.getParagraphs().add(
-                                               new Paragraph(new File(uuid).toURI().toURL()));
+                               chap.getParagraphs().add(new Paragraph(new URL(uuid)));
                        } catch (Exception e) {
                                Instance.syserr(e);
                        }
                }
 
+               if (meta.getCover() == null && !images.isEmpty()) {
+                       InputStream in = Instance.getCache().open(new URL(images.get(0)),
+                                       this, true);
+                       try {
+                               BufferedImage fcover = ImageIO.read(in);
+                               meta.setCover(fcover);
+                               meta.setFakeCover(true);
+                       } finally {
+                               in.close();
+                       }
+               }
+
+               pg.setProgress(100);
                return story;
        }
 }