X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FConfiguration.java;h=f5001b0b002ec88b790d5c122d970f74d5061dae;hb=953de352675a4ad91fe307d816a4ea7780c94274;hp=75f2204849562c605be69fa188c16fe1a6e084ee;hpb=a7d2ac9e58d1fffbb8a9c63c7d4081e8717a6f7f;p=jSite.git

diff --git a/src/de/todesbaum/jsite/main/Configuration.java b/src/de/todesbaum/jsite/main/Configuration.java
index 75f2204..f5001b0 100644
--- a/src/de/todesbaum/jsite/main/Configuration.java
+++ b/src/de/todesbaum/jsite/main/Configuration.java
@@ -1,6 +1,5 @@
 /*
- * jSite - a tool for uploading websites into Freenet
- * Copyright (C) 2006 David Roden
+ * jSite - Configuration.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
@@ -40,6 +39,8 @@ import de.todesbaum.jsite.application.FileOption;
 import de.todesbaum.jsite.application.Node;
 import de.todesbaum.jsite.application.Project;
 import de.todesbaum.jsite.main.ConfigurationLocator.ConfigurationLocation;
+import de.todesbaum.util.freenet.fcp2.ClientPutDir.ManifestPutter;
+import de.todesbaum.util.freenet.fcp2.PriorityClass;
 import de.todesbaum.util.io.Closer;
 import de.todesbaum.util.io.StreamCopier;
 import de.todesbaum.util.xml.SimpleXML;
@@ -336,8 +337,26 @@ public class Configuration {
 					} else {
 						project.setIgnoreHiddenFiles(true);
 					}
-					SimpleXML fileOptionsNode = projectNode.getNode("file-options");
+
+					/* load last insert hashes. */
 					Map<String, FileOption> fileOptions = new HashMap<String, FileOption>();
+					SimpleXML lastInsertHashesNode = projectNode.getNode("last-insert-hashes");
+					if (lastInsertHashesNode != null) {
+						for (SimpleXML fileNode : lastInsertHashesNode.getNodes("file")) {
+							String filename = fileNode.getNode("filename").getValue();
+							String lastInsertHash = fileNode.getNode("last-insert-hash").getValue();
+							int lastInsertEdition = Integer.valueOf(fileNode.getNode("last-insert-edition").getValue());
+							String lastInsertFilename = filename;
+							if (fileNode.getNode("last-insert-filename") != null) {
+								lastInsertFilename = fileNode.getNode("last-insert-filename").getValue();
+							}
+							FileOption fileOption = project.getFileOption(filename);
+							fileOption.setLastInsertHash(lastInsertHash).setLastInsertEdition(lastInsertEdition).setLastInsertFilename(lastInsertFilename);
+							fileOptions.put(filename, fileOption);
+						}
+					}
+
+					SimpleXML fileOptionsNode = projectNode.getNode("file-options");
 					if (fileOptionsNode != null) {
 						SimpleXML[] fileOptionNodes = fileOptionsNode.getNodes("file-option");
 						for (SimpleXML fileOptionNode : fileOptionNodes) {
@@ -352,11 +371,6 @@ public class Configuration {
 								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) {
-								fileOption.setReplaceEdition(Boolean.parseBoolean(fileOptionNode.getNode("replace-edition").getValue()));
-								fileOption.setEditionRange(Integer.parseInt(fileOptionNode.getNode("edition-range").getValue()));
-							}
 							fileOptions.put(filename, fileOption);
 						}
 					}
@@ -389,6 +403,20 @@ public class Configuration {
 			projectNode.append("insert-uri", project.getInsertURI());
 			projectNode.append("request-uri", project.getRequestURI());
 			projectNode.append("ignore-hidden-files", String.valueOf(project.isIgnoreHiddenFiles()));
+
+			/* store last insert hashes. */
+			SimpleXML lastInsertHashesNode = projectNode.append("last-insert-hashes");
+			for (Entry<String, FileOption> fileOption : project.getFileOptions().entrySet()) {
+				if ((fileOption.getValue().getLastInsertHash() == null) || (fileOption.getValue().getLastInsertHash().length() == 0)) {
+					continue;
+				}
+				SimpleXML fileNode = lastInsertHashesNode.append("file");
+				fileNode.append("filename", fileOption.getKey());
+				fileNode.append("last-insert-hash", fileOption.getValue().getLastInsertHash());
+				fileNode.append("last-insert-edition", String.valueOf(fileOption.getValue().getLastInsertEdition()));
+				fileNode.append("last-insert-filename", fileOption.getValue().getLastInsertFilename());
+			}
+
 			SimpleXML fileOptionsNode = projectNode.append("file-options");
 			Iterator<Entry<String, FileOption>> entries = project.getFileOptions().entrySet().iterator();
 			while (entries.hasNext()) {
@@ -402,9 +430,6 @@ public class Configuration {
 					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()));
-					fileOptionNode.append("edition-range", String.valueOf(fileOption.getEditionRange()));
 				}
 			}
 		}
@@ -552,4 +577,69 @@ public class Configuration {
 		}
 	}
 
+	/**
+	 * Returns whether to use the “early encode“ flag for the insert.
+	 *
+	 * @return {@code true} to set the “early encode” flag for the insert,
+	 *         {@code false} otherwise
+	 */
+	public boolean useEarlyEncode() {
+		return getNodeBooleanValue(new String[] { "use-early-encode" }, false);
+	}
+
+	/**
+	 * 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
+	 * @return This configuration
+	 */
+	public Configuration setUseEarlyEncode(boolean useEarlyEncode) {
+		rootNode.replace("use-early-encode", String.valueOf(useEarlyEncode));
+		return this;
+	}
+
+	/**
+	 * Returns the insert priority.
+	 *
+	 * @return The insert priority
+	 */
+	public PriorityClass getPriority() {
+		return PriorityClass.valueOf(getNodeValue(new String[] { "insert-priority" }, "interactive"));
+	}
+
+	/**
+	 * Sets the insert priority.
+	 *
+	 * @param priority
+	 *            The insert priority
+	 * @return This configuration
+	 */
+	public Configuration setPriority(PriorityClass priority) {
+		rootNode.replace("insert-priority", priority.toString());
+		return this;
+	}
+
+	/**
+	 * Returns the manifest putter.
+	 *
+	 * @return The manifest putter
+	 */
+	public ManifestPutter getManifestPutter() {
+		return ManifestPutter.valueOf(getNodeValue(new String[] { "manifest-putter" }, "simple").toUpperCase());
+	}
+
+	/**
+	 * Sets the manifest putter.
+	 *
+	 * @param manifestPutter
+	 *            The manifest putter
+	 * @return This configuration
+	 */
+	public Configuration setManifestPutter(ManifestPutter manifestPutter) {
+		rootNode.replace("manifest-putter", manifestPutter.name().toLowerCase());
+		return this;
+	}
+
 }