X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FCbz.java;h=ee671e779668483bc0efd82038afa898905c3cee;hb=7345d22206e6ff1571dfaef6795aff7007e50bcb;hp=a84428c4f155d35273649ed8c550918b9606f12d;hpb=925298fd058a953144058f8b70d939c2a3e7ea5b;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/output/Cbz.java b/src/be/nikiroo/fanfix/output/Cbz.java
index a84428c..ee671e7 100644
--- 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();