Fix cover file not sent over wire
[fanfix.git] / src / be / nikiroo / fanfix / output / Epub.java
index 869a0bc2647f3e7642ee458faf389684ed48186b..1ff6888ac42e13a185b2e1bda96b3ab9c552aa3d 100644 (file)
@@ -6,7 +6,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
-import java.net.URL;
 
 import javax.imageio.ImageIO;
 
@@ -45,7 +44,8 @@ class Epub extends BasicOutput {
                // "Originals"
                File data = new File(tmpDir, "DATA");
                data.mkdir();
-               new InfoText().process(story, data, targetNameOrig);
+               BasicOutput.getOutput(OutputType.TEXT, isWriteInfo()).process(story,
+                               data, targetNameOrig);
                InfoCover.writeInfo(data, targetNameOrig, story.getMeta());
                IOUtils.writeSmallFile(data, "version", "3.0");
 
@@ -209,7 +209,7 @@ class Epub extends BasicOutput {
                        break;
                case IMAGE:
                        File file = new File(images, getCurrentImageBestName(false));
-                       Instance.getCache().saveAsImage(new URL(para.getContent()), file);
+                       Instance.getCache().saveAsImage(para.getContentImage(), file);
                        writer.write("                  <img class='page-image' src='images/"
                                        + getCurrentImageBestName(false) + "'/>");
                        break;