X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=33bc2403a3bcb1dc407048bc5515d1d8ea1cea18;hb=99b7aae44bab4c7cdb8f1ff58b56b5b25ae239b0;hp=8c30bfd819be0196c92c03ae1ef2073f624bfe1e;hpb=de7d86350a9c5b3d91e6781a6b4a5cbd99d781b7;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 8c30bfd..33bc240 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.core;
 
 import static java.lang.String.format;
 import static java.lang.System.currentTimeMillis;
+import static java.util.logging.Logger.getLogger;
 import static net.pterodactylus.sone.data.Album.NOT_EMPTY;
 
 import java.io.InputStream;
@@ -45,7 +46,6 @@ import net.pterodactylus.sone.data.Sone.SoneStatus;
 import net.pterodactylus.sone.freenet.StringBucket;
 import net.pterodactylus.sone.main.SonePlugin;
 import net.pterodactylus.util.io.Closer;
-import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.template.HtmlFilter;
 import net.pterodactylus.util.template.ReflectionAccessor;
@@ -74,7 +74,7 @@ import freenet.keys.FreenetURI;
 public class SoneInserter extends AbstractService {
 
 	/** The logger. */
-	private static final Logger logger = Logging.getLogger(SoneInserter.class);
+	private static final Logger logger = getLogger("Sone.Inserter");
 
 	/** The insertion delay (in seconds). */
 	private static final AtomicInteger insertionDelay = new AtomicInteger(60);
@@ -229,7 +229,7 @@ public class SoneInserter extends AbstractService {
 						long insertTime = currentTimeMillis();
 						eventBus.post(new SoneInsertingEvent(sone));
 						FreenetURI finalUri = freenetInterface.insertDirectory(sone.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
-						eventBus.post(new SoneInsertedEvent(sone, currentTimeMillis() - insertTime));
+						eventBus.post(new SoneInsertedEvent(sone, currentTimeMillis() - insertTime, insertInformation.getFingerprint()));
 						/* at this point we might already be stopped. */
 						if (shouldStop()) {
 							/* if so, bail out, don’t change anything. */
@@ -283,9 +283,7 @@ public class SoneInserter extends AbstractService {
 	class InsertInformation {
 
 		private final String fingerprint;
-
-		/** All properties of the Sone, copied for thread safety. */
-		private final Map<String, Object> soneProperties = new HashMap<String, Object>();
+		private final ManifestCreator manifestCreator;
 
 		/**
 		 * Creates a new insert information container.
@@ -295,6 +293,7 @@ public class SoneInserter extends AbstractService {
 		 */
 		public InsertInformation(Sone sone) {
 			this.fingerprint = sone.getFingerprint();
+			Map<String, Object> soneProperties = new HashMap<String, Object>();
 			soneProperties.put("id", sone.getId());
 			soneProperties.put("name", sone.getName());
 			soneProperties.put("time", currentTimeMillis());
@@ -305,6 +304,7 @@ public class SoneInserter extends AbstractService {
 			soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
 			soneProperties.put("likedReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
 			soneProperties.put("albums", FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).filter(NOT_EMPTY).toList());
+			manifestCreator = new ManifestCreator(core, soneProperties);
 		}
 
 		//
@@ -329,31 +329,37 @@ public class SoneInserter extends AbstractService {
 			HashMap<String, Object> manifestEntries = new HashMap<String, Object>();
 
 			/* first, create an index.html. */
-			manifestEntries.put("index.html", createManifestElement("index.html", "text/html; charset=utf-8", "/templates/insert/index.html"));
+			manifestEntries.put("index.html", manifestCreator.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"));
+			manifestEntries.put("sone.xml", manifestCreator.createManifestElement(
+					"sone.xml", "text/xml; charset=utf-8",
+					"/templates/insert/sone.xml"));
 
 			return manifestEntries;
 		}
 
-		//
-		// 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) {
+	/**
+	 * Creates manifest elements for an insert by rendering a template.
+	 *
+	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+	 */
+	@VisibleForTesting
+	static class ManifestCreator {
+
+		private final Core core;
+		private final Map<String, Object> soneProperties;
+
+		ManifestCreator(Core core, Map<String, Object> soneProperties) {
+			this.core = core;
+			this.soneProperties = soneProperties;
+		}
+
+		public ManifestElement createManifestElement(String name, String contentType, String templateName) {
 			InputStreamReader templateInputStreamReader = null;
 			InputStream templateInputStream = null;
 			Template template;