X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FHtml.java;h=a02124cc53235dc6aae38e4e24083de16382ee5b;hp=6e0bb6d22d0d0e706e99b7dc605bdc590c1b596b;hb=f977d05b0516f4dcc1978d113ee8e945ab3fb2f9;hpb=333f0e7b5e333e8f6222881ce35398f403fc4121 diff --git a/src/be/nikiroo/fanfix/output/Html.java b/src/be/nikiroo/fanfix/output/Html.java index 6e0bb6d..a02124c 100644 --- a/src/be/nikiroo/fanfix/output/Html.java +++ b/src/be/nikiroo/fanfix/output/Html.java @@ -1,9 +1,11 @@ package be.nikiroo.fanfix.output; +import java.io.BufferedWriter; import java.io.File; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStreamWriter; import javax.imageio.ImageIO; @@ -19,7 +21,7 @@ import be.nikiroo.utils.StringUtils; class Html extends BasicOutput { private File dir; - protected FileWriter writer; + protected BufferedWriter writer; private boolean inDialogue = false; private boolean inNormal = false; @@ -32,12 +34,10 @@ class Html extends BasicOutput { target.mkdir(); dir = target; - targetName = new File(targetName, "index").getPath(); - targetName += getDefaultExtension(); - - target = new File(targetDir, targetName); - - writer = new FileWriter(target); + target = new File(targetDir, targetName + getDefaultExtension(true)); + + writer = new BufferedWriter(new OutputStreamWriter( + new FileOutputStream(target), "UTF-8")); try { super.process(story, targetDir, targetNameOrig); } finally { @@ -56,8 +56,12 @@ class Html extends BasicOutput { } @Override - public String getDefaultExtension() { - return ".html"; + public String getDefaultExtension(boolean readerTarget) { + if (readerTarget) { + return File.separator + "index.html"; + } else { + return ""; + } } @Override @@ -202,7 +206,7 @@ class Html extends BasicOutput { writer.write("
"); break; case BREAK: - writer.write("
"); + writer.write("
"); break; case NORMAL: writer.write(" ");