Merge branch 'subtree'

[fanfix.git] / src / be / nikiroo / fanfix / output / Cbz.java

diff --git a/src/be/nikiroo/fanfix/output/Cbz.java b/src/be/nikiroo/fanfix/output/Cbz.java
index c350eb24d0f88716251551cd192164765c14c980..ee671e779668483bc0efd82038afa898905c3cee 100644 (file)
--- a/src/be/nikiroo/fanfix/output/Cbz.java
+++ b/src/be/nikiroo/fanfix/output/Cbz.java
@@ -6,6 +6,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
+import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Story;
@@ -22,28 +23,32 @@ class Cbz extends BasicOutput {
 
                File target = new File(targetDir, targetName);
 
-               dir = File.createTempFile("fanfic-reader-cbz-dir", ".wip");
-               dir.delete();
-               dir.mkdir();
-
-               // will also save the images!
-               new InfoText().process(story, dir, targetNameOrig);
+               dir = Instance.getInstance().getTempFiles().createTempDir("fanfic-reader-cbz-dir");
+               try {
+                       // will also save the images! (except the cover -> false)
+                       BasicOutput
+                                       .getOutput(OutputType.TEXT, isWriteInfo(), isWriteCover())
+                                       // Force cover to FALSE:
+                                       .setType(OutputType.TEXT, isWriteInfo(), false)
+                                       .process(story, dir, targetNameOrig);
+
+                       try {
+                               super.process(story, targetDir, targetNameOrig);
+                       } finally {
+                       }
 
-               InfoCover.writeInfo(dir, targetNameOrig, story.getMeta());
-               if (story.getMeta() != null && !story.getMeta().isFakeCover()) {
-                       InfoCover.writeCover(dir, targetNameOrig, story.getMeta());
-               }
+                       InfoCover.writeInfo(dir, targetNameOrig, story.getMeta());
+                       if (story.getMeta() != null && !story.getMeta().isFakeCover()) {
+                               InfoCover.writeCover(dir, targetNameOrig, story.getMeta());
+                       }
 
-               IOUtils.writeSmallFile(dir, "version", "3.0");
+                       IOUtils.writeSmallFile(dir, "version", "3.0");
 
-               try {
-                       super.process(story, targetDir, targetNameOrig);
+                       IOUtils.zip(dir, target, true);
                } finally {
+                       IOUtils.deltree(dir);
                }
 
-               IOUtils.zip(dir, target, true);
-               IOUtils.deltree(dir);
-
                return target;
        }
 
@@ -68,7 +73,7 @@ class Cbz extends BasicOutput {
                                new FileOutputStream(new File(dir, "URL")), "UTF-8"));
                try {
                        if (meta != null) {
-                               writer.write(meta.getUuid());
+                               writer.write(meta.getUrl());
                        }
                } finally {
                        writer.close();