Add warning if a project is larger than 2 MiBs.

[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 7c7c89c..eb5abda 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.Connection;
 import de.todesbaum.util.freenet.fcp2.DirectFileEntry;
 import de.todesbaum.util.freenet.fcp2.FileEntry;
 import de.todesbaum.util.freenet.fcp2.Message;
+import de.todesbaum.util.freenet.fcp2.PriorityClass;
 import de.todesbaum.util.freenet.fcp2.RedirectFileEntry;
 import de.todesbaum.util.freenet.fcp2.Verbosity;
 import de.todesbaum.util.io.StreamCopier.ProgressListener;
@@ -93,6 +94,12 @@ public class ProjectInserter implements FileScannerListener, Runnable {
        /** Whether to use “early encode.” */
        private boolean useEarlyEncode;
 
+       /** The insert priority. */
+       private PriorityClass priority;
+
+       /** The manifest putter. */
+       private ManifestPutter manifestPutter;
+
        /**
         * Adds a listener to the list of registered listeners.
         *
@@ -230,6 +237,26 @@ public class ProjectInserter implements FileScannerListener, Runnable {
        }
 
        /**
+        * Sets the insert priority.
+        *
+        * @param priority
+        *            The insert priority
+        */
+       public void setPriority(PriorityClass priority) {
+               this.priority = priority;
+       }
+
+       /**
+        * Sets the manifest putter to use for inserts.
+        *
+        * @param manifestPutter
+        *            The manifest putter to use
+        */
+       public void setManifestPutter(ManifestPutter manifestPutter) {
+               this.manifestPutter = manifestPutter;
+       }
+
+       /**
         * Starts the insert.
         *
         * @param progressListener
@@ -299,18 +326,18 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                        if (!fileOption.isForceInsert() && file.getHash().equals(fileOption.getLastInsertHash())) {
                                /* only insert a redirect. */
                                logger.log(Level.FINE, String.format("Inserting redirect to edition %d for %s.", fileOption.getLastInsertEdition(), filename));
-                               return new RedirectFileEntry(filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + fileOption.getLastInsertEdition() + "/" + filename);
+                               return new RedirectFileEntry(fileOption.hasChangedName() ? fileOption.getChangedName() : filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + fileOption.getLastInsertEdition() + "/" + fileOption.getLastInsertFilename());
                        }
                        try {
                                long[] fileLength = new long[1];
                                InputStream fileEntryInputStream = createFileInputStream(filename, fileOption, edition, fileLength);
-                               fileEntry = new DirectFileEntry(filename, fileOption.getMimeType(), fileEntryInputStream, fileLength[0]);
+                               fileEntry = new DirectFileEntry(fileOption.hasChangedName() ? fileOption.getChangedName() : filename, fileOption.getMimeType(), fileEntryInputStream, fileLength[0]);
                        } catch (IOException ioe1) {
                                /* ignore, null is returned. */
                        }
                } else {
                        if (fileOption.isInsertRedirect()) {
-                               fileEntry = new RedirectFileEntry(filename, fileOption.getMimeType(), fileOption.getCustomKey());
+                               fileEntry = new RedirectFileEntry(fileOption.hasChangedName() ? fileOption.getChangedName() : filename, fileOption.getMimeType(), fileOption.getCustomKey());
                        }
                }
                return fileEntry;
@@ -365,6 +392,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                        checkReport.addIssue("error.no-files-to-insert", true);
                }
                Set<String> fileNames = new HashSet<String>();
+               long totalSize = 0;
                for (Entry<String, FileOption> fileOptionEntry : fileOptionEntries) {
                        FileOption fileOption = fileOptionEntry.getValue();
                        if (!fileOption.isInsert() && !fileOption.isInsertRedirect()) {
@@ -379,6 +407,12 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                        if (!fileNames.add(fileName)) {
                                checkReport.addIssue("error.duplicate-file", true, fileName);
                        }
+                       if (fileOption.isInsert()) {
+                               totalSize += new File(project.getLocalPath(), fileName).length();
+                       }
+               }
+               if (totalSize > 2 * 1024 * 1024) {
+                       checkReport.addIssue("warning.site-larger-than-2-mib", false);
                }
                return checkReport;
        }
@@ -420,7 +454,8 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                putDir.setVerbosity(Verbosity.ALL);
                putDir.setMaxRetries(-1);
                putDir.setEarlyEncode(useEarlyEncode);
-               putDir.setManifestPutter(ManifestPutter.DEFAULT);
+               putDir.setPriorityClass(priority);
+               putDir.setManifestPutter(manifestPutter);
                for (ScannedFile file : files) {
                        FileEntry fileEntry = createFileEntry(file, edition);
                        if (fileEntry != null) {