X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FCbz.java;h=c70cc4123d3e05970d9a36ea29d0da089ecbb98c;hb=2a25f7814eec9854022f1c9dee188bfbdb955591;hp=c1d5955d9260013dc94e25c2abefc2ce682c9536;hpb=10d558d2429c984327f9e5a16933fefe5cc37314;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/output/Cbz.java b/src/be/nikiroo/fanfix/output/Cbz.java index c1d5955..c70cc41 100644 --- a/src/be/nikiroo/fanfix/output/Cbz.java +++ b/src/be/nikiroo/fanfix/output/Cbz.java @@ -25,22 +25,27 @@ class Cbz extends BasicOutput { dir = File.createTempFile("fanfic-reader-cbz-dir", ".wip"); dir.delete(); dir.mkdir(); + try { + // will also save the images! + new InfoText().process(story, dir, targetNameOrig); - // will also save the images! - new InfoText().process(story, dir, targetNameOrig); - InfoCover.writeInfo(dir, targetNameOrig, story.getMeta()); - InfoCover.writeCover(dir, targetNameOrig, story.getMeta()); + InfoCover.writeInfo(dir, targetNameOrig, story.getMeta()); + if (story.getMeta() != null && !story.getMeta().isFakeCover()) { + InfoCover.writeCover(dir, targetNameOrig, story.getMeta()); + } - IOUtils.writeSmallFile(dir, "version", "3.0"); + IOUtils.writeSmallFile(dir, "version", "3.0"); - try { - super.process(story, targetDir, targetNameOrig); + try { + super.process(story, targetDir, targetNameOrig); + } finally { + } + + IOUtils.zip(dir, target, true); } finally { + IOUtils.deltree(dir); } - IOUtils.zip(dir, target, true); - IOUtils.deltree(dir); - return target; } @@ -67,8 +72,6 @@ class Cbz extends BasicOutput { if (meta != null) { writer.write(meta.getUuid()); } - writer.write("\n\n"); - writer.write(builder.toString()); } finally { writer.close(); }