X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FEpub.java;fp=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FEpub.java;h=b56cc339285e4f64c83401b5ba79cfe50bb068fc;hp=64797d395f1442d0d49220f4072bb7df832e9634;hb=2aac79c740789071ad9b773d25f20e103f0da86c;hpb=0ec7855764b78c0956c552566fe52587c2b43f4e

diff --git a/src/be/nikiroo/fanfix/output/Epub.java b/src/be/nikiroo/fanfix/output/Epub.java
index 64797d3..b56cc33 100644
--- a/src/be/nikiroo/fanfix/output/Epub.java
+++ b/src/be/nikiroo/fanfix/output/Epub.java
@@ -36,7 +36,7 @@ class Epub extends BasicOutput {
 		String targetNameOrig = targetName;
 		targetName += getDefaultExtension(false);
 
-		tmpDir = File.createTempFile("fanfic-reader-epub_", ".wip");
+		tmpDir = Instance.getTempFiles().createTempDir("fanfic-reader-epub");
 		tmpDir.delete();
 
 		if (!tmpDir.mkdir()) {
@@ -46,51 +46,54 @@ class Epub extends BasicOutput {
 
 		super.process(story, targetDir, targetNameOrig);
 
-		// "Originals"
-		File data = new File(tmpDir, "DATA");
-		data.mkdir();
-		BasicOutput.getOutput(OutputType.TEXT, isWriteInfo(), isWriteCover())
-				.process(story, data, targetNameOrig);
-		InfoCover.writeInfo(data, targetNameOrig, story.getMeta());
-		IOUtils.writeSmallFile(data, "version", "3.0");
-
-		// zip/epub
-		File epub = new File(targetDir, targetName);
-		IOUtils.zip(tmpDir, epub, true);
-
-		OutputStream out = new FileOutputStream(epub);
+		File epub = null;
 		try {
-			ZipOutputStream zip = new ZipOutputStream(out);
+			// "Originals"
+			File data = new File(tmpDir, "DATA");
+			data.mkdir();
+			BasicOutput.getOutput(OutputType.TEXT, isWriteInfo(),
+					isWriteCover()).process(story, data, targetNameOrig);
+			InfoCover.writeInfo(data, targetNameOrig, story.getMeta());
+			IOUtils.writeSmallFile(data, "version", "3.0");
+
+			// zip/epub
+			epub = new File(targetDir, targetName);
+			IOUtils.zip(tmpDir, epub, true);
+
+			OutputStream out = new FileOutputStream(epub);
 			try {
-				// "mimetype" MUST be the first element and not compressed
-				zip.setLevel(ZipOutputStream.STORED);
-				File mimetype = new File(tmpDir, "mimetype");
-				IOUtils.writeSmallFile(tmpDir, "mimetype",
-						"application/epub+zip");
-				ZipEntry entry = new ZipEntry("mimetype");
-				entry.setExtra(new byte[] {});
-				zip.putNextEntry(entry);
-				FileInputStream in = new FileInputStream(mimetype);
+				ZipOutputStream zip = new ZipOutputStream(out);
 				try {
-					IOUtils.write(in, zip);
+					// "mimetype" MUST be the first element and not compressed
+					zip.setLevel(ZipOutputStream.STORED);
+					File mimetype = new File(tmpDir, "mimetype");
+					IOUtils.writeSmallFile(tmpDir, "mimetype",
+							"application/epub+zip");
+					ZipEntry entry = new ZipEntry("mimetype");
+					entry.setExtra(new byte[] {});
+					zip.putNextEntry(entry);
+					FileInputStream in = new FileInputStream(mimetype);
+					try {
+						IOUtils.write(in, zip);
+					} finally {
+						in.close();
+					}
+					IOUtils.deltree(mimetype);
+					zip.setLevel(ZipOutputStream.DEFLATED);
+					//
+
+					IOUtils.zip(zip, "", tmpDir, true);
 				} finally {
-					in.close();
+					zip.close();
 				}
-				IOUtils.deltree(mimetype);
-				zip.setLevel(ZipOutputStream.DEFLATED);
-				//
-
-				IOUtils.zip(zip, "", tmpDir, true);
 			} finally {
-				zip.close();
+				out.close();
 			}
 		} finally {
-			out.close();
+			IOUtils.deltree(tmpDir);
+			tmpDir = null;
 		}
 
-		IOUtils.deltree(tmpDir);
-		tmpDir = null;
-
 		return epub;
 	}