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 a84428c4f155d35273649ed8c550918b9606f12d..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,9 +23,7 @@ class Cbz extends BasicOutput {
 
                File target = new File(targetDir, targetName);
 
-               dir = File.createTempFile("fanfic-reader-cbz-dir", ".wip");
-               dir.delete();
-               dir.mkdir();
+               dir = Instance.getInstance().getTempFiles().createTempDir("fanfic-reader-cbz-dir");
                try {
                        // will also save the images! (except the cover -> false)
                        BasicOutput
@@ -33,6 +32,11 @@ class Cbz extends BasicOutput {
                                        .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());
@@ -40,11 +44,6 @@ class Cbz extends BasicOutput {
 
                        IOUtils.writeSmallFile(dir, "version", "3.0");
 
-                       try {
-                               super.process(story, targetDir, targetNameOrig);
-                       } finally {
-                       }
-
                        IOUtils.zip(dir, target, true);
                } finally {
                        IOUtils.deltree(dir);
@@ -74,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();