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
update TODO.md
[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 948a2d65ece471813f79af289f59b38a49fb8fec..6fadad7c5ce558561d007b3c08a3934844d82f3e 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");
@@
-130,6
+130,9
@@
class Cbz extends Epub {
Story origStory = getStoryFromTxt(tmpDir, basename);
if (origStory != null) {
story.setChapters(origStory.getChapters());
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());
} else {
story.setChapters(new ArrayList<Chapter>());
story.setMeta(origStory.getMeta());
} else {
story.setChapters(new ArrayList<Chapter>());
@@
-153,7
+156,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);
}
-
} finally {
IOUtils.deltree(tmpDir);
if (zipIn != null) {
} finally {
IOUtils.deltree(tmpDir);
if (zipIn != null) {