X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FHtml.java;h=e91c6f46bfe896b65024bb9f10d3d37abfc2732f;hb=9fe3f17729759e933d7687cc2838f7255f2c9283;hp=dca0fc4a7d1bb48f45a8bd4b502ad5bdfb35b580;hpb=373da363323d3a9263aa6ebd392ca3272b23b412;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/output/Html.java b/src/be/nikiroo/fanfix/output/Html.java index dca0fc4..e91c6f4 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; @@ -37,7 +35,8 @@ class Html extends BasicOutput { // write a copy of the originals inside InfoCover.writeInfo(dir, targetName, story.getMeta()); InfoCover.writeCover(dir, targetName, story.getMeta()); - new InfoText().process(story, dir, targetNameOrig); + BasicOutput.getOutput(OutputType.TEXT, isWriteInfo(), isWriteCover()) + .process(story, dir, targetNameOrig); target = new File(targetDir, targetName + getDefaultExtension(true)); @@ -50,11 +49,9 @@ class Html extends BasicOutput { writer = null; } - String format = Instance.getConfig() - .getString(Config.IMAGE_FORMAT_COVER).toLowerCase(); 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; @@ -64,9 +61,9 @@ class Html extends BasicOutput { public String getDefaultExtension(boolean readerTarget) { if (readerTarget) { return File.separator + "index.html"; - } else { - return ""; } + + return ""; } @Override