X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=cb324cf5a5172af4d03645e440175f5844a5ce11;hb=5bcc095b11defc28f7dadbf9dbaaa43ecf5bfe61;hp=9fad0533f5ad04f457143ff91080cb38586c7120;hpb=1c0a2b5e67dda41e75d2315fd0f6f1cfecf26fa6;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 9fad053..cb324cf 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -17,7 +17,6 @@
 
 package net.pterodactylus.sone.core;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static java.lang.String.format;
 import static java.lang.System.currentTimeMillis;
 import static net.pterodactylus.sone.data.Album.NOT_EMPTY;
@@ -33,9 +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.SoneModificationDetector.LockableFingerprintProvider;
+import net.pterodactylus.sone.core.event.InsertionDelayChangedEvent;
 import net.pterodactylus.sone.core.event.SoneInsertAbortedEvent;
 import net.pterodactylus.sone.core.event.SoneInsertedEvent;
 import net.pterodactylus.sone.core.event.SoneInsertingEvent;
@@ -63,6 +61,7 @@ import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Ordering;
 import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
 
 import freenet.client.async.ManifestElement;
 import freenet.keys.FreenetURI;
@@ -229,7 +228,7 @@ public class SoneInserter extends AbstractService {
 						sone.setStatus(SoneStatus.inserting);
 						long insertTime = currentTimeMillis();
 						eventBus.post(new SoneInsertingEvent(sone));
-						FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
+						FreenetURI finalUri = freenetInterface.insertDirectory(sone.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
 						eventBus.post(new SoneInsertedEvent(sone, currentTimeMillis() - insertTime));
 						/* at this point we might already be stopped. */
 						if (shouldStop()) {
@@ -268,13 +267,9 @@ public class SoneInserter extends AbstractService {
 		}
 	}
 
-	static class SetInsertionDelay implements OptionWatcher<Integer> {
-
-		@Override
-		public void optionChanged(Option<Integer> option, Integer oldValue, Integer newValue) {
-			setInsertionDelay(newValue);
-		}
-
+	@Subscribe
+	public void insertionDelayChanged(InsertionDelayChangedEvent insertionDelayChangedEvent) {
+		setInsertionDelay(insertionDelayChangedEvent.getInsertionDelay());
 	}
 
 	/**
@@ -304,7 +299,6 @@ public class SoneInserter extends AbstractService {
 			soneProperties.put("name", sone.getName());
 			soneProperties.put("time", currentTimeMillis());
 			soneProperties.put("requestUri", sone.getRequestUri());
-			soneProperties.put("insertUri", sone.getInsertUri());
 			soneProperties.put("profile", sone.getProfile());
 			soneProperties.put("posts", Ordering.from(Post.TIME_COMPARATOR).sortedCopy(sone.getPosts()));
 			soneProperties.put("replies", Ordering.from(Reply.TIME_COMPARATOR).reverse().sortedCopy(sone.getReplies()));
@@ -322,15 +316,6 @@ public class SoneInserter extends AbstractService {
 			return fingerprint;
 		}
 
-		/**
-		 * Returns the insert URI of the Sone.
-		 *
-		 * @return The insert URI of the Sone
-		 */
-		public FreenetURI getInsertUri() {
-			return (FreenetURI) soneProperties.get("insertUri");
-		}
-
 		//
 		// ACTIONS
 		//