git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.0.0
[fanfix.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 f9eee08d51428cab98f2c3fbe9b6561cd3087f56..1080ad2755adebb174ad7a3e04f4053c9e0b35f4 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/
src/be/nikiroo/fanfix/supported/Cbz.java
@@
-5,6
+5,8
@@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
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 java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@@
-60,6
+62,7
@@
class Cbz extends Epub {
ZipInputStream zipIn = new ZipInputStream(getInput());
ZipInputStream zipIn = new ZipInputStream(getInput());
+ List<String> images = new ArrayList<String>();
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()
@@
-73,12
+76,10
@@
class Cbz extends Epub {
}
if (imageEntry) {
}
if (imageEntry) {
+ String uuid = meta.getUuid() + "_" + entry.getName();
+ images.add(uuid);
try {
try {
- String uuid = meta.getUuid() + "_" + entry.getName();
-
Instance.getCache().addToCache(zipIn, uuid);
Instance.getCache().addToCache(zipIn, uuid);
- chap.getParagraphs().add(
- new Paragraph(new File(uuid).toURI().toURL()));
} catch (Exception e) {
Instance.syserr(e);
}
} catch (Exception e) {
Instance.syserr(e);
}
@@
-86,6
+87,18
@@
class Cbz extends Epub {
}
}
}
}
+ // ZIP order is not sure
+ Collections.sort(images);
+
+ for (String uuid : images) {
+ try {
+ chap.getParagraphs().add(
+ new Paragraph(new File(uuid).toURI().toURL()));
+ } catch (Exception e) {
+ Instance.syserr(e);
+ }
+ }
+
return story;
}
}
return story;
}
}