any kind of error will abort the insert

[jSite.git] / src / de / todesbaum / jsite / application / ProjectInserter.java

diff --git a/src/de/todesbaum/jsite/application/ProjectInserter.java b/src/de/todesbaum/jsite/application/ProjectInserter.java
index 0fcddcc..7b4d619 100644 (file)
--- a/src/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/de/todesbaum/jsite/application/ProjectInserter.java
@@ -43,6 +43,7 @@ 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;
 
@@ -59,7 +60,6 @@ public class ProjectInserter implements FileScannerListener, Runnable {
        protected Project project;
        private FileScanner fileScanner;
        protected final Object lockObject = new Object();
-       private int maxRetries = 99999;
 
        public void addInsertListener(InsertListener insertListener) {
                insertListeners.add(insertListener);
@@ -117,14 +117,6 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                this.freenetInterface = freenetInterface;
        }
 
-       /**
-        * @param maxRetries
-        *            The maxRetries to set.
-        */
-       public void setMaxRetries(int maxRetries) {
-               this.maxRetries = maxRetries;
-       }
-
        public void start() {
                fileScanner = new FileScanner(project);
                fileScanner.addFileScannerListener(this);
@@ -140,15 +132,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);
@@ -159,35 +155,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);
@@ -271,7 +259,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                ClientPutComplexDir putDir = new ClientPutComplexDir("dir-" + counter++, dirURI);
                putDir.setDefaultName(project.getIndexFile());
                putDir.setVerbosity(Verbosity.ALL);
-               putDir.setMaxRetries(maxRetries);
+               putDir.setMaxRetries(-1);
                for (String filename: files) {
                        FileEntry fileEntry = createFileEntry(filename, edition, containerFiles);
                        if (fileEntry != null) {
@@ -313,7 +301,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");
                        }
                }