Set temp directory on connetion and put dir command.

[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 e0ca446..597c237 100644 (file)
--- a/src/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/de/todesbaum/jsite/application/ProjectInserter.java
@@ -30,6 +30,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -54,15 +56,15 @@ import de.todesbaum.util.io.StreamCopier;
  */
 public class ProjectInserter implements FileScannerListener, Runnable {
 
+       /** The logger. */
+       private static final Logger logger = Logger.getLogger(ProjectInserter.class.getName());
+
        /** Random number for FCP instances. */
        private static final int random = (int) (Math.random() * Integer.MAX_VALUE);
 
        /** Counter for FCP connection identifier. */
        private static int counter = 0;
 
-       /** Whether debug mode is set. */
-       private boolean debug = false;
-
        /** The list of insert listeners. */
        private List<InsertListener> insertListeners = new ArrayList<InsertListener>();
 
@@ -78,6 +80,9 @@ public class ProjectInserter implements FileScannerListener, Runnable {
        /** Object used for synchronization. */
        protected final Object lockObject = new Object();
 
+       /** The temp directory. */
+       private String tempDirectory;
+
        /**
         * Adds a listener to the list of registered listeners.
         *
@@ -125,6 +130,17 @@ public class ProjectInserter implements FileScannerListener, Runnable {
        /**
         * Notifies all listeners that the insert has made some progress.
         *
+        * @see InsertListener#projectUploadFinished(Project)
+        */
+       protected void fireProjectUploadFinished() {
+               for (InsertListener insertListener : insertListeners) {
+                       insertListener.projectUploadFinished(project);
+               }
+       }
+
+       /**
+        * Notifies all listeners that the insert has made some progress.
+        *
         * @see InsertListener#projectInsertProgress(Project, int, int, int, int,
         *      boolean)
         * @param succeeded
@@ -162,17 +178,6 @@ public class ProjectInserter implements FileScannerListener, Runnable {
        }
 
        /**
-        * Sets the debug mode.
-        *
-        * @param debug
-        *            <code>true</code> to activate debug mode, <code>false</code>
-        *            to deactivate
-        */
-       public void setDebug(boolean debug) {
-               this.debug = debug;
-       }
-
-       /**
         * Sets the project to insert.
         *
         * @param project
@@ -193,6 +198,17 @@ public class ProjectInserter implements FileScannerListener, Runnable {
        }
 
        /**
+        * Sets the temp directory to use.
+        *
+        * @param tempDirectory
+        *            The temp directory to use, or {@code null} to use the system
+        *            default
+        */
+       public void setTempDirectory(String tempDirectory) {
+               this.tempDirectory = tempDirectory;
+       }
+
+       /**
         * Starts the insert.
         */
        public void start() {
@@ -264,7 +280,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
         *             if an I/O error occurs
         */
        private InputStream createContainerInputStream(Map<String, List<String>> containerFiles, String containerName, int edition, long[] containerLength) throws IOException {
-               File tempFile = File.createTempFile("jsite", ".zip");
+               File tempFile = File.createTempFile("jsite", ".zip", (tempDirectory == null) ? null : new File(tempDirectory));
                tempFile.deleteOnExit();
                FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
                ZipOutputStream zipOutputStream = new ZipOutputStream(fileOutputStream);
@@ -370,6 +386,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 
                /* create connection to node */
                Connection connection = freenetInterface.getConnection("project-insert-" + random + counter++);
+               connection.setTempDirectory(tempDirectory);
                boolean connected = false;
                Throwable cause = null;
                try {
@@ -393,8 +410,10 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                /* collect files */
                int edition = project.getEdition();
                String dirURI = "USK@" + project.getInsertURI() + "/" + project.getPath() + "/" + edition + "/";
-               ClientPutComplexDir putDir = new ClientPutComplexDir("dir-" + counter++, dirURI);
-               putDir.setDefaultName(project.getIndexFile());
+               ClientPutComplexDir putDir = new ClientPutComplexDir("dir-" + counter++, dirURI, tempDirectory);
+               if ((project.getIndexFile() != null) && (project.getIndexFile().length() > 0)) {
+                       putDir.setDefaultName(project.getIndexFile());
+               }
                putDir.setVerbosity(Verbosity.ALL);
                putDir.setMaxRetries(-1);
                for (String filename : files) {
@@ -414,15 +433,18 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 
                /* parse progress and success messages */
                String finalURI = null;
+               boolean firstMessage = true;
                boolean success = false;
                boolean finished = false;
                boolean disconnected = false;
                while (!finished) {
                        Message message = client.readMessage();
                        finished = (message == null) || (disconnected = client.isDisconnected());
-                       if (debug) {
-                               System.out.println(message);
+                       if (firstMessage) {
+                               fireProjectUploadFinished();
+                               firstMessage = false;
                        }
+                       logger.log(Level.FINE, "Received message: " + message);
                        if (!finished) {
                                @SuppressWarnings("null")
                                String messageName = message.getName();