X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FProjectInserter.java;h=eb5abdabba965ab138574300e9bbd977e87e8960;hb=51ef8ebc341e6ec53237bbeb18860ff77e591ac4;hp=d16be3edd955f72c90c0c7aae8b538e48df3a718;hpb=66b60fe3515217a8c2892a20ee79524ce3a919e2;p=jSite.git

diff --git a/src/de/todesbaum/jsite/application/ProjectInserter.java b/src/de/todesbaum/jsite/application/ProjectInserter.java
index d16be3e..eb5abda 100644
--- a/src/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/de/todesbaum/jsite/application/ProjectInserter.java
@@ -326,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;
@@ -392,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()) {
@@ -406,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;
 	}