Update nikiroo-utils, bugfixes:

[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..f67f28ae6f936af9235305b8c568e4ad8ed7310f 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.java
@@ -1,12 +1,14 @@
 package be.nikiroo.fanfix.supported;
 
-import java.io.File;
+import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -14,6 +16,8 @@ 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.ImageUtils;
+import be.nikiroo.utils.Progress;
 
 /**
  * Support class for CBZ files (works better with CBZ created with this program,
@@ -54,15 +58,25 @@ class Cbz extends Epub {
        }
 
        @Override
-       public Story process(URL url) throws IOException {
-               Story story = processMeta(url, false, true);
+       public Story process(URL url, Progress pg) throws IOException {
+               if (pg == null) {
+                       pg = new Progress();
+               } else {
+                       pg.setMinMax(0, 100);
+               }
+
+               Progress pgMeta = new Progress();
+               pg.addProgress(pgMeta, 10);
+               Story story = processMeta(url, false, true, pgMeta);
+               pgMeta.done(); // 10%
+
                story.setChapters(new ArrayList<Chapter>());
                Chapter chap = new Chapter(1, null);
                story.getChapters().add(chap);
 
                ZipInputStream zipIn = new ZipInputStream(getInput());
 
-               List<String> images = new ArrayList<String>();
+               Map<String, BufferedImage> images = new HashMap<String, BufferedImage>();
                for (ZipEntry entry = zipIn.getNextEntry(); entry != null; entry = zipIn
                                .getNextEntry()) {
                        if (!entry.isDirectory()
@@ -77,28 +91,40 @@ class Cbz extends Epub {
 
                                if (imageEntry) {
                                        String uuid = meta.getUuid() + "_" + entry.getName();
-                                       images.add(uuid);
                                        try {
-                                               Instance.getCache().addToCache(zipIn, uuid);
+                                               images.put(uuid, ImageUtils.fromStream(zipIn));
                                        } catch (Exception e) {
-                                               Instance.syserr(e);
+                                               Instance.getTraceHandler().error(e);
+                                       }
+
+                                       if (pg.getProgress() < 85) {
+                                               pg.add(1);
                                        }
                                }
                        }
                }
 
-               // ZIP order is not sure
-               Collections.sort(images);
+               pg.setProgress(85);
 
-               for (String uuid : images) {
+               // ZIP order is not correct for us
+               List<String> imagesList = new ArrayList<String>(images.keySet());
+               Collections.sort(imagesList);
+
+               pg.setProgress(90);
+
+               for (String uuid : imagesList) {
                        try {
-                               chap.getParagraphs().add(
-                                               new Paragraph(new File(uuid).toURI().toURL()));
+                               chap.getParagraphs().add(new Paragraph(images.get(uuid)));
                        } catch (Exception e) {
-                               Instance.syserr(e);
+                               Instance.getTraceHandler().error(e);
                        }
                }
 
+               if (meta.getCover() == null && !images.isEmpty()) {
+                       meta.setCover(images.get(imagesList.get(0)));
+               }
+
+               pg.setProgress(100);
                return story;
        }
 }