git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't check against NULL on NotNull
[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 b63ec5d45395c8a8529e1e20bcdfef8f267626e4..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;
package be.nikiroo.fanfix.supported;
-import java.
io.Fil
e;
+import java.
awt.image.BufferedImag
e;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
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.List;
+import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@@
-14,6
+16,7
@@
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.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;
/**
import be.nikiroo.utils.Progress;
/**
@@
-62,15
+65,18
@@
class Cbz extends Epub {
pg.setMinMax(0, 100);
}
pg.setMinMax(0, 100);
}
- Story story = processMeta(url, false, true);
+ 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());
story.setChapters(new ArrayList<Chapter>());
Chapter chap = new Chapter(1, null);
story.getChapters().add(chap);
ZipInputStream zipIn = new ZipInputStream(getInput());
- pg.setProgress(10);
- 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()
for (ZipEntry entry = zipIn.getNextEntry(); entry != null; entry = zipIn
.getNextEntry()) {
if (!entry.isDirectory()
@@
-85,31
+91,39
@@
class Cbz extends Epub {
if (imageEntry) {
String uuid = meta.getUuid() + "_" + entry.getName();
if (imageEntry) {
String uuid = meta.getUuid() + "_" + entry.getName();
- images.add(uuid);
try {
try {
-
Instance.getCache().addToCache(zipIn, uuid
);
+
images.put(uuid, ImageUtils.fromStream(zipIn)
);
} catch (Exception e) {
} catch (Exception e) {
- Instance.syserr(e);
+ Instance.getTraceHandler().error(e);
+ }
+
+ if (pg.getProgress() < 85) {
+ pg.add(1);
}
}
}
}
}
}
}
}
- pg.setProgress(80);
+ pg.setProgress(85);
+
+ // ZIP order is not correct for us
+ List<String> imagesList = new ArrayList<String>(images.keySet());
+ Collections.sort(imagesList);
- // ZIP order is not sure
- Collections.sort(images);
pg.setProgress(90);
pg.setProgress(90);
- for (String uuid : images) {
+ for (String uuid : images
List
) {
try {
try {
- chap.getParagraphs().add(
- new Paragraph(new File(uuid).toURI().toURL()));
+ chap.getParagraphs().add(new Paragraph(images.get(uuid)));
} catch (Exception e) {
} catch (Exception e) {
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
}
}
}
}
+ if (meta.getCover() == null && !images.isEmpty()) {
+ meta.setCover(images.get(imagesList.get(0)));
+ }
+
pg.setProgress(100);
return story;
}
pg.setProgress(100);
return story;
}