X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FHtml.java;h=f81ea1dc5f643d20de832dcd96b48ec4070172ab;hb=1387a30ab59dbf4071f2c5e5e0e08ca98c75b726;hp=3ed52ad6a3b22491397b61aeb31175320dbcdada;hpb=3d247bc3bb955a9b85686f0db431157cb9dc4a10;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/output/Html.java b/src/be/nikiroo/fanfix/output/Html.java
index 3ed52ad..f81ea1d 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,9 +32,7 @@ class Html extends BasicOutput {
 		target.mkdir();
 		dir = target;
 
-		targetName += getDefaultExtension();
-
-		target = new File(targetDir, targetName);
+		target = new File(targetDir, targetName + getDefaultExtension(true));
 
 		writer = new BufferedWriter(new OutputStreamWriter(
 				new FileOutputStream(target), "UTF-8"));
@@ -47,19 +43,26 @@ 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;
 	}
 
 	@Override
-	public String getDefaultExtension() {
-		return File.separator + "index.html";
+	public String getDefaultExtension(boolean readerTarget) {
+		if (readerTarget) {
+			return File.separator + "index.html";
+		}
+
+		return "";
 	}
 
 	@Override
@@ -87,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) {
@@ -204,7 +207,7 @@ class Html extends BasicOutput {
 			writer.write("		<div class='blank'></div>");
 			break;
 		case BREAK:
-			writer.write("		<hr/>");
+			writer.write("		<hr class='break'/>");
 			break;
 		case NORMAL:
 			writer.write("		<span class='normal'>");
@@ -213,7 +216,7 @@ class Html extends BasicOutput {
 			writer.write("			<div class='dialogue'>&mdash; ");
 			break;
 		case IMAGE:
-			// TODO
+			// TODO check if images work OK
 			writer.write("<a href='"
 					+ StringUtils.xmlEscapeQuote(para.getContent()) + "'>"
 					+ StringUtils.xmlEscape(para.getContent()) + "</a>");