version 0.4.8.1: set maxRetries to -1

[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 8ec92db..b51dd0c 100644 (file)
--- a/src/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/de/todesbaum/jsite/application/ProjectInserter.java
@@ -48,7 +48,7 @@ import de.todesbaum.util.io.StreamCopier;
 
 /**
  * @author David Roden <droden@gmail.com>
- * @version $Id: ProjectInserter.java 440 2006-03-30 09:31:25Z bombe $
+ * @version $Id$
  */
 public class ProjectInserter implements FileScannerListener, Runnable {
 
@@ -59,7 +59,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);
@@ -74,6 +73,12 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                        insertListener.projectInsertStarted(project);
                }
        }
+       
+       protected void fireProjectURIGenerated(String uri) {
+               for (InsertListener insertListener: insertListeners) {
+                       insertListener.projectURIGenerated(project, uri);
+               }
+       }
 
        protected void fireProjectInsertProgress(int succeeded, int failed, int fatal, int total, boolean finalized) {
                for (InsertListener insertListener: insertListeners) {
@@ -111,14 +116,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);
@@ -134,12 +131,11 @@ 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("$[CONTAINER]", "/");
                outputStream.addReplacement("$[EDITION]", String.valueOf(edition));
-               outputStream.addReplacement("$[URI]", project.getFinalURI(0));
+               outputStream.addReplacement("$[URI]", project.getFinalRequestURI(0));
                for (int index = 1; index <= fileOption.getEditionRange(); index++) {
-               outputStream.addReplacement("$[URI+" + index + "]", project.getFinalURI(index));
-                       outputStream.addReplacement("$[URI+" + index + "]", project.getFinalURI(index));
+                       outputStream.addReplacement("$[URI+" + index + "]", project.getFinalRequestURI(index));
+                       outputStream.addReplacement("$[EDITION+" + index + "]", String.valueOf(edition + index));
                }
                StreamCopier.copy(fileInput, outputStream, length[0]);
                outputStream.close();
@@ -240,12 +236,19 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 
                /* create connection to node */
                Connection connection = freenetInterface.getConnection("project-insert-" + counter++);
+               boolean connected = false;
+               Throwable cause = null;
                try {
-                       connection.connect();
+                       connected = connection.connect();
                } catch (IOException e1) {
-                       fireProjectInsertFinished(false, e1);
+                       cause = e1;
+               }
+               
+               if (!connected) {
+                       fireProjectInsertFinished(false, cause);
                        return;
                }
+               
                Client client = new Client(connection);
 
                /* create containers */
@@ -254,12 +257,12 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                createContainers(files, containers, containerFiles);
 
                /* collect files */
-               int edition = ((EditionProject) project).getEdition();
-               String dirURI = project.getInsertURI() + project.getPath() + "-" + edition;
+               int edition = project.getEdition();
+               String dirURI = "freenet:USK@" + project.getInsertURI() + "/" + project.getPath() + "/" + edition + "/";
                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) {
@@ -276,17 +279,22 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                }
 
                /* parse progress and success messages */
-               boolean success = true;
+               String finalURI = null;
+               boolean success = false;
                boolean finished = false;
                boolean disconnected = false;
                while (!finished) {
                        Message message = client.readMessage();
-                       finished = (message == null) && (disconnected = client.isDisconnected());
+                       finished = (message == null) || (disconnected = client.isDisconnected());
                        if (debug) {
                                System.out.println(message);
                        }
                        if (!finished) {
                                String messageName = message.getName();
+                               if ("URIGenerated".equals(messageName)) {
+                                       finalURI = message.get("URI");
+                                       fireProjectURIGenerated(finalURI);
+                               }
                                if ("SimpleProgress".equals(messageName)) {
                                        int total = Integer.parseInt(message.get("Total"));
                                        int succeeded = Integer.parseInt(message.get("Succeeded"));
@@ -303,9 +311,9 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                /* post-insert work */
                fireProjectInsertFinished(success, disconnected ? new IOException("Connection terminated") : null);
                if (success) {
-                       if (project instanceof EditionProject) {
-                               ((EditionProject) project).setEdition(edition + 1);
-                       }
+                       String editionPart = finalURI.substring(finalURI.lastIndexOf('/') + 1);
+                       int newEdition = Integer.parseInt(editionPart);
+                       project.setEdition(newEdition);
                }
        }