X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FProjectInserter.java;h=10f3bf4beb125e422796f0c79165b0318cf28b4c;hb=cf9a525446c958a12839c7d62d15fecc4d79b73d;hp=db4d514c98c640bd7a1a5d7c01d8b6fa03c8eca7;hpb=d087e3fdc2e752bc073dee0dcaf5c970c3f1bc7d;p=jSite.git

diff --git a/src/de/todesbaum/jsite/application/ProjectInserter.java b/src/de/todesbaum/jsite/application/ProjectInserter.java
index db4d514..10f3bf4 100644
--- a/src/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/de/todesbaum/jsite/application/ProjectInserter.java
@@ -34,6 +34,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import de.todesbaum.jsite.gui.FileScanner;
+import de.todesbaum.jsite.gui.FileScanner.ScannedFile;
 import de.todesbaum.jsite.gui.FileScannerListener;
 import de.todesbaum.util.freenet.fcp2.Client;
 import de.todesbaum.util.freenet.fcp2.ClientPutComplexDir;
@@ -268,37 +269,35 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 	 * Creates a file entry suitable for handing in to
 	 * {@link ClientPutComplexDir#addFileEntry(FileEntry)}.
 	 *
-	 * @param filename
-	 *            The name of the file to insert
+	 * @param file
+	 *            The name and hash of the file to insert
 	 * @param edition
 	 *            The current edition
-	 * @param containerFiles
-	 *            The container definitions
 	 * @return A file entry for the given file
 	 */
-	private FileEntry createFileEntry(String filename, int edition, Map<String, List<String>> containerFiles) {
+	private FileEntry createFileEntry(ScannedFile file, int edition) {
 		FileEntry fileEntry = null;
+		String filename = file.getFilename();
 		FileOption fileOption = project.getFileOption(filename);
+		if (fileOption.isInsert()) {
+			/* check if file was modified. */
+			if (file.getHash().equals(fileOption.getLastInsertHash())) {
+				/* only insert a redirect. */
+				return new RedirectFileEntry(filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + project.getEdition() + "/" + filename);
+			}
+			fileOption.setCurrentHash(file.getHash());
 			try {
-				long[] containerLength = new long[1];
-				InputStream containerInputStream = createContainerInputStream(containerFiles, containerName, edition, containerLength);
-				fileEntry = new DirectFileEntry(containerName + ".zip", "application/zip", containerInputStream, containerLength[0]);
+				long[] fileLength = new long[1];
+				InputStream fileEntryInputStream = createFileInputStream(filename, fileOption, edition, fileLength);
+				fileEntry = new DirectFileEntry(filename, fileOption.getMimeType(), fileEntryInputStream, fileLength[0]);
 			} catch (IOException ioe1) {
 				/* ignore, null is returned. */
 			}
 		} else {
-			if (fileOption.isInsert()) {
-				try {
-					long[] fileLength = new long[1];
-					InputStream fileEntryInputStream = createFileInputStream(filename, fileOption, edition, fileLength);
-					fileEntry = new DirectFileEntry(filename, project.getFileOption(filename).getMimeType(), fileEntryInputStream, fileLength[0]);
-				} catch (IOException ioe1) {
-					/* ignore, null is returned. */
-				}
+			if (fileOption.isInsertRedirect()) {
+				fileEntry = new RedirectFileEntry(filename, fileOption.getMimeType(), fileOption.getCustomKey());
 			} else {
-				if (fileOption.isInsertRedirect()) {
-					fileEntry = new RedirectFileEntry(filename, fileOption.getMimeType(), fileOption.getCustomKey());
-				}
+				fileOption.setLastInsertHash("");
 			}
 		}
 		return fileEntry;
@@ -376,7 +375,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 	 */
 	public void run() {
 		fireProjectInsertStarted();
-		List<String> files = fileScanner.getFiles();
+		List<ScannedFile> files = fileScanner.getFiles();
 
 		/* create connection to node */
 		synchronized (lockObject) {
@@ -409,8 +408,8 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 		putDir.setMaxRetries(-1);
 		putDir.setEarlyEncode(false);
 		putDir.setManifestPutter(ManifestPutter.DEFAULT);
-		for (String filename : files) {
-			FileEntry fileEntry = createFileEntry(filename, edition, containerFiles);
+		for (ScannedFile file : files) {
+			FileEntry fileEntry = createFileEntry(file, edition);
 			if (fileEntry != null) {
 				try {
 					putDir.addFileEntry(fileEntry);
@@ -466,6 +465,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 			int newEdition = Integer.parseInt(editionPart);
 			project.setEdition(newEdition);
 			project.setLastInsertionTime(System.currentTimeMillis());
+			project.copyHashes();
 		}
 		fireProjectInsertFinished(success, cancelled ? new AbortedException() : (disconnected ? new IOException("Connection terminated") : null));
 	}