From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Fri, 21 Sep 2012 10:50:34 +0000 (+0200)
Subject: Use a project’s “always force insert” setting when inserting the project.
X-Git-Tag: 0.11^2~6
X-Git-Url: https://git.pterodactylus.net/?p=jSite.git;a=commitdiff_plain;h=b084107c9af548804c526711b4e49e1b65c82f7a

Use a project’s “always force insert” setting when inserting the project.
---

diff --git a/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java b/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
index ed06533..30d4d7a 100644
--- a/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
@@ -324,7 +324,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 		if (fileOption.isInsert()) {
 			fileOption.setCurrentHash(file.getHash());
 			/* check if file was modified. */
-			if (!fileOption.isForceInsert() && file.getHash().equals(fileOption.getLastInsertHash())) {
+			if (!project.isAlwaysForceInsert() && !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(fileOption.hasChangedName() ? fileOption.getChangedName() : filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + fileOption.getLastInsertEdition() + "/" + fileOption.getLastInsertFilename());