X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=01e414d814b99825768bd2c485bf8249a00cd61a;hb=9a920789e2b9109d4de0adb676a00797f2d36bfb;hp=48241aa43dab584591125cbe9513511bbbaae99f;hpb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792;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 48241aa..01e414d 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.core;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
@@ -29,6 +31,7 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.core.event.SoneInsertAbortedEvent;
 import net.pterodactylus.sone.core.event.SoneInsertedEvent;
 import net.pterodactylus.sone.core.event.SoneInsertingEvent;
+import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
@@ -47,6 +50,7 @@ import net.pterodactylus.util.template.TemplateException;
 import net.pterodactylus.util.template.TemplateParser;
 import net.pterodactylus.util.template.XmlFilter;
 
+import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Ordering;
 import com.google.common.eventbus.EventBus;
 
@@ -88,7 +92,7 @@ public class SoneInserter extends AbstractService {
 	private final FreenetInterface freenetInterface;
 
 	/** The Sone to insert. */
-	private final Sone sone;
+	private volatile Sone sone;
 
 	/** Whether a modification has been detected. */
 	private volatile boolean modified = false;
@@ -121,8 +125,21 @@ public class SoneInserter extends AbstractService {
 	//
 
 	/**
-	 * Changes the insertion delay, i.e. the time the Sone inserter waits after
-	 * it has noticed a Sone modification before it starts the insert.
+	 * Sets the Sone to insert.
+	 *
+	 * @param sone
+	 * 		The Sone to insert
+	 * @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");
+		this.sone = sone;
+		return this;
+	}
+
+	/**
+	 * Changes the insertion delay, i.e. the time the Sone inserter waits after it
+	 * has noticed a Sone modification before it starts the insert.
 	 *
 	 * @param insertionDelay
 	 *            The insertion delay (in seconds)
@@ -173,12 +190,14 @@ public class SoneInserter extends AbstractService {
 		long lastModificationTime = 0;
 		String lastInsertedFingerprint = lastInsertFingerprint;
 		String lastFingerprint = "";
+		Sone sone;
 		while (!shouldStop()) {
 			try {
 				/* check every seconds. */
 				sleep(1000);
 
 				/* don’t insert locked Sones. */
+				sone = this.sone;
 				if (core.isLocked(sone)) {
 					/* trigger redetection when the Sone is unlocked. */
 					synchronized (sone) {
@@ -289,7 +308,7 @@ public class SoneInserter extends AbstractService {
 			soneProperties.put("replies", Ordering.from(Reply.TIME_COMPARATOR).reverse().sortedCopy(sone.getReplies()));
 			soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
 			soneProperties.put("likedReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
-			soneProperties.put("albums", sone.getAllAlbums());
+			soneProperties.put("albums", FluentIterable.from(sone.getAlbums()).transformAndConcat(Album.FLATTENER).toList());
 		}
 
 		//