X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FProjectInserter.java;h=bc2ae354561a87335a2805505c030b2d19eaa852;hb=250630a5fb1ff745f05788210a6efd976533fb55;hp=b51dd0c715ba13d739a6f70912d9492a034ca48b;hpb=8cc524061375237e2f5c01cfe605e3e74d50d785;p=jSite.git

diff --git a/src/de/todesbaum/jsite/application/ProjectInserter.java b/src/de/todesbaum/jsite/application/ProjectInserter.java
index b51dd0c..bc2ae35 100644
--- a/src/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/de/todesbaum/jsite/application/ProjectInserter.java
@@ -43,12 +43,12 @@ import de.todesbaum.util.freenet.fcp2.FileEntry;
 import de.todesbaum.util.freenet.fcp2.Message;
 import de.todesbaum.util.freenet.fcp2.RedirectFileEntry;
 import de.todesbaum.util.freenet.fcp2.Verbosity;
+import de.todesbaum.util.io.Closer;
 import de.todesbaum.util.io.ReplacingOutputStream;
 import de.todesbaum.util.io.StreamCopier;
 
 /**
- * @author David Roden <droden@gmail.com>
- * @version $Id$
+ * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
  */
 public class ProjectInserter implements FileScannerListener, Runnable {
 
@@ -131,15 +131,19 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 		ByteArrayOutputStream filteredByteOutputStream = new ByteArrayOutputStream(Math.min(Integer.MAX_VALUE, (int) length[0]));
 		ReplacingOutputStream outputStream = new ReplacingOutputStream(filteredByteOutputStream);
 		FileInputStream fileInput = new FileInputStream(file);
-		outputStream.addReplacement("$[EDITION]", String.valueOf(edition));
-		outputStream.addReplacement("$[URI]", project.getFinalRequestURI(0));
-		for (int index = 1; index <= fileOption.getEditionRange(); index++) {
-			outputStream.addReplacement("$[URI+" + index + "]", project.getFinalRequestURI(index));
-			outputStream.addReplacement("$[EDITION+" + index + "]", String.valueOf(edition + index));
+		try {
+			outputStream.addReplacement("$[EDITION]", String.valueOf(edition));
+			outputStream.addReplacement("$[URI]", project.getFinalRequestURI(0));
+			for (int index = 1; index <= fileOption.getEditionRange(); index++) {
+				outputStream.addReplacement("$[URI+" + index + "]", project.getFinalRequestURI(index));
+				outputStream.addReplacement("$[EDITION+" + index + "]", String.valueOf(edition + index));
+			}
+			StreamCopier.copy(fileInput, outputStream, length[0]);
+		} finally {
+			Closer.close(fileInput);
+			Closer.close(outputStream);
+			Closer.close(filteredByteOutputStream);
 		}
-		StreamCopier.copy(fileInput, outputStream, length[0]);
-		outputStream.close();
-		filteredByteOutputStream.close();
 		byte[] filteredBytes = filteredByteOutputStream.toByteArray();
 		length[0] = filteredBytes.length;
 		return new ByteArrayInputStream(filteredBytes);
@@ -150,35 +154,27 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 		tempFile.deleteOnExit();
 		FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
 		ZipOutputStream zipOutputStream = new ZipOutputStream(fileOutputStream);
-		for (String filename: containerFiles.get(containerName)) {
-			File dataFile = new File(project.getLocalPath(), filename);
-			if (dataFile.exists()) {
-				ZipEntry zipEntry = new ZipEntry(filename);
-				long[] fileLength = new long[1];
-				InputStream wrappedInputStream = createFileInputStream(filename, project.getFileOption(filename), edition, fileLength);
-				zipOutputStream.putNextEntry(zipEntry);
-				StreamCopier.copy(wrappedInputStream, zipOutputStream, fileLength[0]);
-				zipOutputStream.closeEntry();
-				wrappedInputStream.close();
+		try {
+			for (String filename: containerFiles.get(containerName)) {
+				File dataFile = new File(project.getLocalPath(), filename);
+				if (dataFile.exists()) {
+					ZipEntry zipEntry = new ZipEntry(filename);
+					long[] fileLength = new long[1];
+					InputStream wrappedInputStream = createFileInputStream(filename, project.getFileOption(filename), edition, fileLength);
+					try {
+						zipOutputStream.putNextEntry(zipEntry);
+						StreamCopier.copy(wrappedInputStream, zipOutputStream, fileLength[0]);
+					} finally {
+						zipOutputStream.closeEntry();
+						wrappedInputStream.close();
+					}
+				}
 			}
+		} finally {	
+			zipOutputStream.closeEntry();
+			Closer.close(zipOutputStream);
+			Closer.close(fileOutputStream);
 		}
-		zipOutputStream.closeEntry();
-
-		/* FIXME - create metadata */
-		// ZipEntry metadataEntry = new ZipEntry("metadata");
-		// zipOutputStream.putNextEntry(metadataEntry);
-		// Metadata zipMetadata = new Metadata();
-		// for (String filename: containerFiles.get(containerName)) {
-		// if (new File(project.getLocalPath(), filename).exists()) {
-		// DocumentMetadata zipEntryMetadata = new DocumentMetadata();
-		// zipEntryMetadata.setName(filename);
-		// zipEntryMetadata.setFormat(project.getFileOption(filename).getMimeType());
-		// zipMetadata.addDocument(zipEntryMetadata);
-		// }
-		// }
-		// zipOutputStream.write(zipMetadata.toByteArray());
-		// zipOutputStream.closeEntry();
-		zipOutputStream.close();
 
 		containerLength[0] = tempFile.length();
 		return new FileInputStream(tempFile);
@@ -258,7 +254,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 
 		/* collect files */
 		int edition = project.getEdition();
-		String dirURI = "freenet:USK@" + project.getInsertURI() + "/" + project.getPath() + "/" + edition + "/";
+		String dirURI = "USK@" + project.getInsertURI() + "/" + project.getPath() + "/" + edition + "/";
 		ClientPutComplexDir putDir = new ClientPutComplexDir("dir-" + counter++, dirURI);
 		putDir.setDefaultName(project.getIndexFile());
 		putDir.setVerbosity(Verbosity.ALL);
@@ -304,7 +300,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 					fireProjectInsertProgress(succeeded, failed, fatal, total, finalized);
 				}
 				success = "PutSuccessful".equals(messageName);
-				finished = success || "PutFailed".equals(messageName);
+				finished = success || "PutFailed".equals(messageName) || messageName.endsWith("Error");
 			}
 		}