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
code cleanup / jdoc
[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 76b66aba7c75fa24317eb4daca6ff75854658326..a5391d07575e9f6102ab531e4a756c1be718f711 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/
src/be/nikiroo/fanfix/supported/Cbz.java
@@
-63,6
+63,8
@@
class Cbz extends Epub {
} else {
pg.setMinMax(0, 100);
}
} else {
pg.setMinMax(0, 100);
}
+
+ pg.setName("Initialising");
Progress pgMeta = new Progress();
pg.addProgress(pgMeta, 10);
Progress pgMeta = new Progress();
pg.addProgress(pgMeta, 10);
@@
-70,7
+72,7
@@
class Cbz extends Epub {
MetaData meta = story.getMeta();
pgMeta.done(); // 10%
MetaData meta = story.getMeta();
pgMeta.done(); // 10%
-
+
File tmpDir = Instance.getInstance().getTempFiles().createTempDir("info-text");
String basename = null;
File tmpDir = Instance.getInstance().getTempFiles().createTempDir("info-text");
String basename = null;
@@
-95,7
+97,13
@@
class Cbz extends Epub {
if (imageEntry) {
String uuid = meta.getUuid() + "_" + entry.getName();
try {
if (imageEntry) {
String uuid = meta.getUuid() + "_" + entry.getName();
try {
- images.put(uuid, new Image(zipIn));
+ Image img = new Image(zipIn);
+ if (img.getSize() == 0) {
+ img.close();
+ throw new IOException(
+ "Empty image not accepted");
+ }
+ images.put(uuid, img);
} catch (Exception e) {
Instance.getInstance().getTraceHandler().error(e);
}
} catch (Exception e) {
Instance.getInstance().getTraceHandler().error(e);
}
@@
-166,7
+174,7
@@
class Cbz extends Epub {
}
if (!imagesList.isEmpty()) {
}
if (!imagesList.isEmpty()) {
- Chapter chap = new Chapter(story.getChapters().size() + 1,
null
);
+ Chapter chap = new Chapter(story.getChapters().size() + 1,
""
);
story.getChapters().add(chap);
for (String uuid : imagesList) {
story.getChapters().add(chap);
for (String uuid : imagesList) {
@@
-193,7
+201,7
@@
class Cbz extends Epub {
}
}
}
}
- pg.
setProgress(100
);
+ pg.
done(
);
return story;
}
return story;
}