X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FConfiguration.java;h=d03d70a0467c3209422d08edbb3b2d47c38dba04;hb=321a7a1d782260f91d1cdbe8eece1c20909b83ef;hp=9d288b5fdb7a213279ed227a91ffd7f5b5b4196b;hpb=e2e553c23e712178421dbedae7308466fc23c9c9;p=jSite.git

diff --git a/src/de/todesbaum/jsite/main/Configuration.java b/src/de/todesbaum/jsite/main/Configuration.java
index 9d288b5..d03d70a 100644
--- a/src/de/todesbaum/jsite/main/Configuration.java
+++ b/src/de/todesbaum/jsite/main/Configuration.java
@@ -332,7 +332,11 @@ public class Configuration {
 					Project project = new Project();
 					projects.add(project);
 					project.setDescription(projectNode.getNode("description").getValue(""));
-					project.setIndexFile(projectNode.getNode("index-file").getValue(""));
+					String indexFile = projectNode.getNode("index-file").getValue("");
+					if (indexFile.indexOf('/') > -1) {
+						indexFile = "";
+					}
+					project.setIndexFile(indexFile);
 					project.setLastInsertionTime(Long.parseLong(projectNode.getNode("last-insertion-time").getValue("0")));
 					project.setLocalPath(projectNode.getNode("local-path").getValue(""));
 					project.setName(projectNode.getNode("name").getValue(""));
@@ -343,6 +347,11 @@ public class Configuration {
 					project.setEdition(Integer.parseInt(projectNode.getNode("edition").getValue("0")));
 					project.setInsertURI(projectNode.getNode("insert-uri").getValue(""));
 					project.setRequestURI(projectNode.getNode("request-uri").getValue(""));
+					if (projectNode.getNode("ignore-hidden-files") != null) {
+						project.setIgnoreHiddenFiles(Boolean.parseBoolean(projectNode.getNode("ignore-hidden-files").getValue("true")));
+					} else {
+						project.setIgnoreHiddenFiles(true);
+					}
 					SimpleXML fileOptionsNode = projectNode.getNode("file-options");
 					Map<String, FileOption> fileOptions = new HashMap<String, FileOption>();
 					if (fileOptionsNode != null) {
@@ -351,7 +360,13 @@ public class Configuration {
 							String filename = fileOptionNode.getNode("filename").getValue();
 							FileOption fileOption = project.getFileOption(filename);
 							fileOption.setInsert(Boolean.parseBoolean(fileOptionNode.getNode("insert").getValue()));
+							if (fileOptionNode.getNode("insert-redirect") != null) {
+								fileOption.setInsertRedirect(Boolean.parseBoolean(fileOptionNode.getNode("insert-redirect").getValue()));
+							}
 							fileOption.setCustomKey(fileOptionNode.getNode("custom-key").getValue(""));
+							if (fileOptionNode.getNode("changed-name") != null) {
+								fileOption.setChangedName(fileOptionNode.getNode("changed-name").getValue());
+							}
 							fileOption.setMimeType(fileOptionNode.getNode("mime-type").getValue(""));
 							fileOption.setContainer(fileOptionNode.getNode("container").getValue());
 							if (fileOptionNode.getNode("replace-edition") != null) {
@@ -389,6 +404,7 @@ public class Configuration {
 			projectNode.append("path", project.getPath());
 			projectNode.append("insert-uri", project.getInsertURI());
 			projectNode.append("request-uri", project.getRequestURI());
+			projectNode.append("ignore-hidden-files", String.valueOf(project.isIgnoreHiddenFiles()));
 			SimpleXML fileOptionsNode = projectNode.append("file-options");
 			Iterator<Entry<String, FileOption>> entries = project.getFileOptions().entrySet().iterator();
 			while (entries.hasNext()) {
@@ -398,7 +414,9 @@ public class Configuration {
 					SimpleXML fileOptionNode = fileOptionsNode.append("file-option");
 					fileOptionNode.append("filename", entry.getKey());
 					fileOptionNode.append("insert", String.valueOf(fileOption.isInsert()));
+					fileOptionNode.append("insert-redirect", String.valueOf(fileOption.isInsertRedirect()));
 					fileOptionNode.append("custom-key", fileOption.getCustomKey());
+					fileOptionNode.append("changed-name", fileOption.getChangedName());
 					fileOptionNode.append("mime-type", fileOption.getMimeType());
 					fileOptionNode.append("container", fileOption.getContainer());
 					fileOptionNode.append("replace-edition", String.valueOf(fileOption.getReplaceEdition()));