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=ee98cb2d8aa7dcbe9470f2839baf533868d28862;hpb=d30a8ff8477a24f8a1f7c90924ba6d89c0c6242e;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 ee98cb2..ac2cb3f 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -26,11 +26,14 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.StringBucket;
+import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
 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;
 
@@ -49,8 +52,12 @@ public class SoneInserter extends AbstractService {
 
 	static {
 		templateFactory.addAccessor(Object.class, new ReflectionAccessor());
+		templateFactory.addFilter("xml", new XmlFilter());
 	}
 
+	/** The UTF-8 charset. */
+	private static final Charset utf8Charset = Charset.forName("UTF-8");
+
 	/** The Freenet interface. */
 	private final FreenetInterface freenetInterface;
 
@@ -81,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();
@@ -95,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) {
@@ -108,13 +122,15 @@ public class SoneInserter extends AbstractService {
 				if (success) {
 					synchronized (sone) {
 						if (sone.getModificationCounter() == modificationCounter) {
+							logger.log(Level.FINE, "Sone “%s” was not modified further, resetting counter…", new Object[] { sone });
 							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);
 		}
 	}
 
@@ -178,20 +194,14 @@ public class SoneInserter extends AbstractService {
 		 *
 		 * @return The manifest entries for the Sone insert
 		 */
-		@SuppressWarnings("synthetic-access")
 		public HashMap<String, Object> generateManifestEntries() {
 			HashMap<String, Object> manifestEntries = new HashMap<String, Object>();
 
-			Charset utf8Charset = Charset.forName("UTF-8");
-
 			/* first, create an index.html. */
-			Template indexTemplate = templateFactory.createTemplate(new InputStreamReader(getClass().getResourceAsStream("/templates/insert/index.html"), utf8Charset));
-			indexTemplate.set("currentSone", sone);
-			StringWriter indexWriter = new StringWriter();
-			indexTemplate.render(indexWriter);
-			StringBucket indexBucket = new StringBucket(indexWriter.toString(), utf8Charset);
-			ManifestElement indexManifestElement = new ManifestElement("index.html", indexBucket, "text/html; charset=utf-8", indexBucket.size());
-			manifestEntries.put("index.html", indexManifestElement);
+			manifestEntries.put("index.html", createManifestElement("index.html", "text/html; charset=utf-8", "/templates/insert/index.html"));
+
+			/* now, store the sone. */
+			manifestEntries.put("sone.xml", createManifestElement("sone.xml", "text/xml; charset=utf-8", "/templates/insert/sone.xml"));
 
 			return manifestEntries;
 		}
@@ -200,6 +210,47 @@ public class SoneInserter extends AbstractService {
 		// PRIVATE METHODS
 		//
 
+		/**
+		 * Creates a new manifest element.
+		 *
+		 * @param name
+		 *            The name of the file
+		 * @param contentType
+		 *            The content type of the file
+		 * @param templateName
+		 *            The name of the template to render
+		 * @return The manifest element
+		 */
+		@SuppressWarnings("synthetic-access")
+		private ManifestElement createManifestElement(String name, String contentType, String templateName) {
+			InputStreamReader templateInputStreamReader;
+			Template template = templateFactory.createTemplate(templateInputStreamReader = new InputStreamReader(getClass().getResourceAsStream(templateName), utf8Charset));
+			try {
+				template.parse();
+			} catch (TemplateException te1) {
+				logger.log(Level.SEVERE, "Could not parse template “" + templateName + "”!", te1);
+				return null;
+			} finally {
+				Closer.close(templateInputStreamReader);
+			}
+			template.set("currentSone", sone);
+			StringWriter writer = new StringWriter();
+			StringBucket bucket = null;
+			try {
+				template.render(writer);
+				bucket = new StringBucket(writer.toString(), utf8Charset);
+				return new ManifestElement(name, bucket, contentType, bucket.size());
+			} catch (TemplateException te1) {
+				logger.log(Level.SEVERE, "Could not render template “" + templateName + "”!", te1);
+				return null;
+			} finally {
+				Closer.close(writer);
+				if (bucket != null) {
+					bucket.free();
+				}
+			}
+		}
+
 	}
 
 }