X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FHtml.java;h=756eb8d328907e3d02eb19cede3c57dd51082ce4;hb=77fea1c0131fd9723ef06e65ab566e380fc7c876;hp=f5fbb831c51cf063d856e89bbe095a687de107f7;hpb=5083ef84efb7e001c0b5de235d3424e1b59c62f4;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/output/Html.java b/src/be/nikiroo/fanfix/output/Html.java index f5fbb83..756eb8d 100644 --- a/src/be/nikiroo/fanfix/output/Html.java +++ b/src/be/nikiroo/fanfix/output/Html.java @@ -7,8 +7,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStreamWriter; -import javax.imageio.ImageIO; - import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.bundles.Config; import be.nikiroo.fanfix.data.Chapter; @@ -34,12 +32,6 @@ class Html extends BasicOutput { target.mkdir(); dir = target; - // write a copy of the originals inside - InfoCover.writeInfo(dir, targetName, story.getMeta()); - InfoCover.writeCover(dir, targetName, story.getMeta()); - BasicOutput.getOutput(OutputType.TEXT, isWriteInfo()).process(story, - dir, targetNameOrig); - target = new File(targetDir, targetName + getDefaultExtension(true)); writer = new BufferedWriter(new OutputStreamWriter( @@ -51,11 +43,15 @@ class Html extends BasicOutput { writer = null; } - String format = Instance.getConfig() - .getString(Config.IMAGE_FORMAT_COVER).toLowerCase(); + // write a copy of the originals inside + InfoCover.writeInfo(dir, targetName, story.getMeta()); + InfoCover.writeCover(dir, targetName, story.getMeta()); + BasicOutput.getOutput(OutputType.TEXT, isWriteInfo(), isWriteCover()) + .process(story, dir, targetNameOrig); + if (story.getMeta().getCover() != null) { - ImageIO.write(story.getMeta().getCover(), format, new File(dir, - "cover." + format)); + Instance.getCache().saveAsImage(story.getMeta().getCover(), + new File(dir, "cover"), true); } return target;