X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FHtml.java;h=e91c6f46bfe896b65024bb9f10d3d37abfc2732f;hb=16a81ef7656c5c692fb831927e75edde25dd77a0;hp=1ec2a082df5691ddb8fe136baa6e8a626c06ad1f;hpb=10d558d2429c984327f9e5a16933fefe5cc37314;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/output/Html.java b/src/be/nikiroo/fanfix/output/Html.java index 1ec2a08..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; @@ -34,6 +32,12 @@ 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(), isWriteCover()) + .process(story, dir, targetNameOrig); + target = new File(targetDir, targetName + getDefaultExtension(true)); writer = new BufferedWriter(new OutputStreamWriter( @@ -45,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; @@ -59,9 +61,9 @@ class Html extends BasicOutput { public String getDefaultExtension(boolean readerTarget) { if (readerTarget) { return File.separator + "index.html"; - } else { - return ""; } + + return ""; } @Override @@ -206,7 +208,7 @@ class Html extends BasicOutput { writer.write("
"); break; case BREAK: - writer.write("
"); + writer.write("
"); break; case NORMAL: writer.write(" ");