X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=1e93aa67229bca4fa4a8741ba8346bb51ee78bd3;hb=c74a6b50636ab4c13967ac90fa4155eea028b836;hp=7001be173ac3116c442d05d4eb22db73a800e82b;hpb=2bccc50e24eec9fc0f20df72fd67c6887c1254dd;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 7001be1..1e93aa6 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static java.lang.System.currentTimeMillis;
 import static net.pterodactylus.sone.data.Album.NOT_EMPTY;
 
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
@@ -31,6 +32,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.core.Options.Option;
+import net.pterodactylus.sone.core.Options.OptionWatcher;
 import net.pterodactylus.sone.core.event.SoneInsertAbortedEvent;
 import net.pterodactylus.sone.core.event.SoneInsertedEvent;
 import net.pterodactylus.sone.core.event.SoneInsertingEvent;
@@ -53,6 +56,7 @@ import net.pterodactylus.util.template.TemplateException;
 import net.pterodactylus.util.template.TemplateParser;
 import net.pterodactylus.util.template.XmlFilter;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Ordering;
 import com.google.common.eventbus.EventBus;
@@ -112,12 +116,17 @@ public class SoneInserter extends AbstractService {
 	 *            The Sone to insert
 	 */
 	public SoneInserter(Core core, EventBus eventBus, FreenetInterface freenetInterface, Sone sone) {
+		this(core, eventBus, freenetInterface, sone, new SoneModificationDetector(core, sone, insertionDelay));
+	}
+
+	@VisibleForTesting
+	SoneInserter(Core core, EventBus eventBus, FreenetInterface freenetInterface, Sone sone, SoneModificationDetector soneModificationDetector) {
 		super("Sone Inserter for “" + sone.getName() + "”", false);
 		this.core = core;
 		this.eventBus = eventBus;
 		this.freenetInterface = freenetInterface;
 		this.sone = sone;
-		this.soneModificationDetector = new SoneModificationDetector(core, sone, insertionDelay);
+		this.soneModificationDetector = soneModificationDetector;
 	}
 
 	//
@@ -132,11 +141,16 @@ public class SoneInserter extends AbstractService {
 	 * @return This Sone inserter
 	 */
 	public SoneInserter setSone(Sone sone) {
-		checkArgument((this.sone == null) || sone.equals(this.sone), "Sone to insert can not be set to a different Sone");
+		checkArgument(sone.equals(this.sone), "Sone to insert can not be set to a different Sone");
 		this.sone = sone;
 		return this;
 	}
 
+	@VisibleForTesting
+	static AtomicInteger getInsertionDelay() {
+		return insertionDelay;
+	}
+
 	/**
 	 * Changes the insertion delay, i.e. the time the Sone inserter waits after it
 	 * has noticed a Sone modification before it starts the insert.
@@ -200,7 +214,6 @@ public class SoneInserter extends AbstractService {
 					try {
 						sone.setStatus(SoneStatus.inserting);
 						long insertTime = currentTimeMillis();
-						insertInformation.setTime(insertTime);
 						eventBus.post(new SoneInsertingEvent(sone));
 						FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
 						eventBus.post(new SoneInsertedEvent(sone, currentTimeMillis() - insertTime));
@@ -241,6 +254,15 @@ public class SoneInserter extends AbstractService {
 		}
 	}
 
+	static class SetInsertionDelay implements OptionWatcher<Integer> {
+
+		@Override
+		public void optionChanged(Option<Integer> option, Integer oldValue, Integer newValue) {
+			setInsertionDelay(newValue);
+		}
+
+	}
+
 	/**
 	 * Container for information that are required to insert a Sone. This
 	 * container merely exists to copy all relevant data without holding a lock
@@ -248,7 +270,8 @@ public class SoneInserter extends AbstractService {
 	 *
 	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
-	private class InsertInformation {
+	@VisibleForTesting
+	class InsertInformation {
 
 		private final String fingerprint;
 
@@ -265,7 +288,7 @@ public class SoneInserter extends AbstractService {
 			this.fingerprint = sone.getFingerprint();
 			soneProperties.put("id", sone.getId());
 			soneProperties.put("name", sone.getName());
-			soneProperties.put("time", sone.getTime());
+			soneProperties.put("time", currentTimeMillis());
 			soneProperties.put("requestUri", sone.getRequestUri());
 			soneProperties.put("insertUri", sone.getInsertUri());
 			soneProperties.put("profile", sone.getProfile());
@@ -280,7 +303,8 @@ public class SoneInserter extends AbstractService {
 		// ACCESSORS
 		//
 
-		private String getFingerprint() {
+		@VisibleForTesting
+		String getFingerprint() {
 			return fingerprint;
 		}
 
@@ -293,16 +317,6 @@ public class SoneInserter extends AbstractService {
 			return (FreenetURI) soneProperties.get("insertUri");
 		}
 
-		/**
-		 * Sets the time of the Sone at the time of the insert.
-		 *
-		 * @param time
-		 *            The time of the Sone
-		 */
-		public void setTime(long time) {
-			soneProperties.put("time", time);
-		}
-
 		//
 		// ACTIONS
 		//
@@ -342,15 +356,18 @@ public class SoneInserter extends AbstractService {
 		@SuppressWarnings("synthetic-access")
 		private ManifestElement createManifestElement(String name, String contentType, String templateName) {
 			InputStreamReader templateInputStreamReader = null;
+			InputStream templateInputStream = null;
 			Template template;
 			try {
-				templateInputStreamReader = new InputStreamReader(getClass().getResourceAsStream(templateName), utf8Charset);
+				templateInputStream = getClass().getResourceAsStream(templateName);
+				templateInputStreamReader = new InputStreamReader(templateInputStream, utf8Charset);
 				template = TemplateParser.parse(templateInputStreamReader);
 			} catch (TemplateException te1) {
 				logger.log(Level.SEVERE, String.format("Could not parse template “%s”!", templateName), te1);
 				return null;
 			} finally {
 				Closer.close(templateInputStreamReader);
+				Closer.close(templateInputStream);
 			}
 
 			TemplateContext templateContext = templateContextFactory.createTemplateContext();