X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=ac2cb3fed84aaf3b41578924381f06cebe87bf01;hb=374fd8726663084c37cf7ce2d7f752ca7a4f888e;hp=307037c729393bad7135f7c5f47029c4970a7d3d;hpb=353ec3673841821dfcee1486122dc13cce978e55;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 307037c..ac2cb3f 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -33,6 +33,7 @@ import net.pterodactylus.util.template.DefaultTemplateFactory;
 import net.pterodactylus.util.template.ReflectionAccessor;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateException;
+import net.pterodactylus.util.template.XmlFilter;
 import freenet.client.async.ManifestElement;
 import freenet.keys.FreenetURI;
 
@@ -51,6 +52,7 @@ public class SoneInserter extends AbstractService {
 
 	static {
 		templateFactory.addAccessor(Object.class, new ReflectionAccessor());
+		templateFactory.addFilter("xml", new XmlFilter());
 	}
 
 	/** The UTF-8 charset. */
@@ -86,7 +88,13 @@ public class SoneInserter extends AbstractService {
 	@Override
 	protected void serviceRun() {
 		long modificationCounter = 0;
+		boolean restartNow = true;
 		while (!shouldStop()) {
+			if (!restartNow) {
+				logger.log(Level.FINEST, "Waiting 60 seconds before checking Sone “" + sone.getName() + "”.");
+				sleep(60 * 1000);
+			}
+			restartNow = false;
 			InsertInformation insertInformation = null;
 			synchronized (sone) {
 				modificationCounter = sone.getModificationCounter();
@@ -100,6 +108,7 @@ public class SoneInserter extends AbstractService {
 				boolean success = false;
 				try {
 					FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri().setKeyType("USK").setDocName("Sone-" + sone.getName()).setSuggestedEdition(0), insertInformation.generateManifestEntries(), "index.html");
+					sone.updateUris(finalUri);
 					success = true;
 					logger.log(Level.INFO, "Inserted Sone “%s” at %s.", new Object[] { sone.getName(), finalUri });
 				} catch (SoneException se1) {
@@ -117,12 +126,11 @@ public class SoneInserter extends AbstractService {
 							sone.setModificationCounter(0);
 						} else {
 							logger.log(Level.FINE, "Sone “%s” was modified since the insert started, starting another insert…", new Object[] { sone });
+							restartNow = true;
 						}
 					}
 				}
 			}
-			logger.log(Level.FINEST, "Waiting 60 seconds before checking Sone “" + sone.getName() + "” again.");
-			sleep(60 * 1000);
 		}
 	}