import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
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,
}
@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);
ZipInputStream zipIn = new ZipInputStream(getInput());
+ pg.setProgress(10);
+ List<String> images = new ArrayList<String>();
for (ZipEntry entry = zipIn.getNextEntry(); entry != null; entry = zipIn
.getNextEntry()) {
if (!entry.isDirectory()
}
if (imageEntry) {
+ String uuid = meta.getUuid() + "_" + entry.getName();
+ images.add(uuid);
try {
- String uuid = meta.getUuid() + "_" + entry.getName();
-
Instance.getCache().addToCache(zipIn, uuid);
- chap.getParagraphs().add(
- new Paragraph(new File(uuid).toURI().toURL()));
} catch (Exception e) {
Instance.syserr(e);
}
}
}
+ pg.setProgress(80);
+
+ // ZIP order is not sure
+ Collections.sort(images);
+ pg.setProgress(90);
+
+ for (String uuid : images) {
+ try {
+ chap.getParagraphs().add(
+ new Paragraph(new File(uuid).toURI().toURL()));
+ } catch (Exception e) {
+ Instance.syserr(e);
+ }
+ }
+
+ pg.setProgress(100);
return story;
}
}