X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FCbz.java;h=490ba8f04fe936e8f25417f7e829a5ed075045c9;hb=2aac79c740789071ad9b773d25f20e103f0da86c;hp=c70cc4123d3e05970d9a36ea29d0da089ecbb98c;hpb=2a25f7814eec9854022f1c9dee188bfbdb955591;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/output/Cbz.java b/src/be/nikiroo/fanfix/output/Cbz.java index c70cc41..490ba8f 100644 --- a/src/be/nikiroo/fanfix/output/Cbz.java +++ b/src/be/nikiroo/fanfix/output/Cbz.java @@ -6,6 +6,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; +import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.data.MetaData; import be.nikiroo.fanfix.data.Paragraph; import be.nikiroo.fanfix.data.Story; @@ -22,12 +23,19 @@ class Cbz extends BasicOutput { File target = new File(targetDir, targetName); - dir = File.createTempFile("fanfic-reader-cbz-dir", ".wip"); - dir.delete(); - dir.mkdir(); + dir = Instance.getTempFiles().createTempDir("fanfic-reader-cbz-dir"); try { - // will also save the images! - new InfoText().process(story, dir, targetNameOrig); + // will also save the images! (except the cover -> false) + BasicOutput + .getOutput(OutputType.TEXT, isWriteInfo(), isWriteCover()) + // Force cover to FALSE: + .setType(OutputType.TEXT, isWriteInfo(), false) + .process(story, dir, targetNameOrig); + + try { + super.process(story, targetDir, targetNameOrig); + } finally { + } InfoCover.writeInfo(dir, targetNameOrig, story.getMeta()); if (story.getMeta() != null && !story.getMeta().isFakeCover()) { @@ -36,11 +44,6 @@ class Cbz extends BasicOutput { IOUtils.writeSmallFile(dir, "version", "3.0"); - try { - super.process(story, targetDir, targetNameOrig); - } finally { - } - IOUtils.zip(dir, target, true); } finally { IOUtils.deltree(dir);