X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FCbz.java;h=ee671e779668483bc0efd82038afa898905c3cee;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=8853c7695a2c6ac94883f6b8d1b80146e0710d3f;hpb=5083ef84efb7e001c0b5de235d3424e1b59c62f4;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/output/Cbz.java b/src/be/nikiroo/fanfix/output/Cbz.java
index 8853c76..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,13 +23,19 @@ 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!
-			BasicOutput.getOutput(OutputType.TEXT, isWriteInfo()).process(
-					story, dir, targetNameOrig);
+			// 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()) {
@@ -37,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);
@@ -71,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();