X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FProjectInserter.java;h=1f5e8ef9c37de86a0096606103bc4444b0184e48;hb=3c1268861fad63a64a21fc2d46041ca736e48be9;hp=c8cc0a2856ca76945dbd750f7ac282fe7988543f;hpb=6f266954d6e92764d372c8d2d2a153e3a582a337;p=jSite.git

diff --git a/src/de/todesbaum/jsite/application/ProjectInserter.java b/src/de/todesbaum/jsite/application/ProjectInserter.java
index c8cc0a2..1f5e8ef 100644
--- a/src/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/de/todesbaum/jsite/application/ProjectInserter.java
@@ -1,5 +1,5 @@
 /*
- * jSite - ProjectInserter.java - Copyright © 2006–2011 David Roden
+ * jSite - ProjectInserter.java - Copyright © 2006–2012 David Roden
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,8 +28,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -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;
@@ -90,6 +91,15 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 	/** Progress listener for payload transfers. */
 	private ProgressListener progressListener;
 
+	/** 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.
 	 *
@@ -216,6 +226,37 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 	}
 
 	/**
+	 * Sets whether to use the “early encode“ flag for the insert.
+	 *
+	 * @param useEarlyEncode
+	 *            {@code true} to set the “early encode” flag for the insert,
+	 *            {@code false} otherwise
+	 */
+	public void setUseEarlyEncode(boolean useEarlyEncode) {
+		this.useEarlyEncode = useEarlyEncode;
+	}
+
+	/**
+	 * 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
@@ -282,7 +323,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 		if (fileOption.isInsert()) {
 			fileOption.setCurrentHash(file.getHash());
 			/* check if file was modified. */
-			if (file.getHash().equals(fileOption.getLastInsertHash())) {
+			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);
@@ -290,13 +331,13 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 			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;
@@ -405,8 +446,9 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 		}
 		putDir.setVerbosity(Verbosity.ALL);
 		putDir.setMaxRetries(-1);
-		putDir.setEarlyEncode(false);
-		putDir.setManifestPutter(ManifestPutter.DEFAULT);
+		putDir.setEarlyEncode(useEarlyEncode);
+		putDir.setPriorityClass(priority);
+		putDir.setManifestPutter(manifestPutter);
 		for (ScannedFile file : files) {
 			FileEntry fileEntry = createFileEntry(file, edition);
 			if (fileEntry != null) {
@@ -464,7 +506,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 			int newEdition = Integer.parseInt(editionPart);
 			project.setEdition(newEdition);
 			project.setLastInsertionTime(System.currentTimeMillis());
-			project.copyHashes();
+			project.onSuccessfulInsert();
 		}
 		fireProjectInsertFinished(success, cancelled ? new AbortedException() : (disconnected ? new IOException("Connection terminated") : null));
 	}