Instance: use getInstance()

[nikiroo-utils.git] / src / be / nikiroo / fanfix / output / Html.java

diff --git a/src/be/nikiroo/fanfix/output/Html.java b/src/be/nikiroo/fanfix/output/Html.java
index dca0fc4a7d1bb48f45a8bd4b502ad5bdfb35b580..da79466a40d9cc2fcf80872d77ef6e588398e732 100644 (file)
--- 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,11 +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());
-               new InfoText().process(story, dir, targetNameOrig);
-
                target = new File(targetDir, targetName + getDefaultExtension(true));
 
                writer = new BufferedWriter(new OutputStreamWriter(
@@ -50,11 +43,14 @@ 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.getInstance().getCache().saveAsImage(story.getMeta().getCover(), new File(dir, "cover"), true);
                }
 
                return target;
@@ -64,9 +60,9 @@ class Html extends BasicOutput {
        public String getDefaultExtension(boolean readerTarget) {
                if (readerTarget) {
                        return File.separator + "index.html";
-               } else {
-                       return "";
                }
+
+               return "";
        }
 
        @Override
@@ -94,8 +90,8 @@ class Html extends BasicOutput {
                        author = meta.getAuthor();
                }
 
-               String format = Instance.getConfig()
-                               .getString(Config.IMAGE_FORMAT_COVER).toLowerCase();
+               String format = Instance.getInstance().getConfig()
+                               .getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER).toLowerCase();
 
                InputStream inStyle = getClass().getResourceAsStream("html.style.css");
                if (inStyle == null) {