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
cbz: fix support to discard story
[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 1cf07c5d0f162c0f300e4a389c0a6282819e7c99..3aaa355b7b0827015e8334af7362f56c2bdc966d 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/
src/be/nikiroo/fanfix/supported/Cbz.java
@@
-72,7
+72,7
@@
class Cbz extends Epub {
pg.addProgress(pgMeta, 10);
Story story = processMeta(true, pgMeta);
MetaData meta = story.getMeta();
pg.addProgress(pgMeta, 10);
Story story = processMeta(true, pgMeta);
MetaData meta = story.getMeta();
-
+
pgMeta.done(); // 10%
File tmpDir = Instance.getTempFiles().createTempDir("info-text");
pgMeta.done(); // 10%
File tmpDir = Instance.getTempFiles().createTempDir("info-text");
@@
-126,17
+126,15
@@
class Cbz extends Epub {
pg.setProgress(90);
pg.setProgress(90);
- //
include original story
+ //
only the description is kept, we do not support hybrid CBZ
Story origStory = getStoryFromTxt(tmpDir, basename);
if (origStory != null) {
Story origStory = getStoryFromTxt(tmpDir, basename);
if (origStory != null) {
- story.setChapters(origStory.getChapters());
if (origStory.getMeta().getCover() == null) {
origStory.getMeta().setCover(story.getMeta().getCover());
}
story.setMeta(origStory.getMeta());
if (origStory.getMeta().getCover() == null) {
origStory.getMeta().setCover(story.getMeta().getCover());
}
story.setMeta(origStory.getMeta());
- } else {
- story.setChapters(new ArrayList<Chapter>());
}
}
+ story.setChapters(new ArrayList<Chapter>());
if (!imagesList.isEmpty()) {
Chapter chap = new Chapter(story.getChapters().size() + 1, null);
if (!imagesList.isEmpty()) {
Chapter chap = new Chapter(story.getChapters().size() + 1, null);
@@
-156,8
+154,6
@@
class Cbz extends Epub {
meta.setCover(images.get(imagesList.get(0)));
meta.setFakeCover(true);
}
meta.setCover(images.get(imagesList.get(0)));
meta.setFakeCover(true);
}
-
-System.out.println("Meta from Cbz support at end: "+meta);
} finally {
IOUtils.deltree(tmpDir);
if (zipIn != null) {
} finally {
IOUtils.deltree(tmpDir);
if (zipIn != null) {