X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=04254d491c1ab17b4c741ef32696ce3369f6a321;hb=48ac9dedd81abd3d2ef58110e39e09a91fa3c659;hp=8efcc73713bda663c44138d072926ec4aae60916;hpb=de928fae67034e4694d7d8e8ea73573d400491f4;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 8efcc73..04254d4 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -17,12 +17,18 @@
 
 package net.pterodactylus.sone.core;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static net.pterodactylus.sone.data.Album.NOT_EMPTY;
+import static net.pterodactylus.sone.data.Sone.TO_FREENET_URI;
+import static net.pterodactylus.sone.data.Sone.TO_INSERT_URI;
+
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -48,13 +54,14 @@ import net.pterodactylus.util.template.TemplateException;
 import net.pterodactylus.util.template.TemplateParser;
 import net.pterodactylus.util.template.XmlFilter;
 
+import freenet.client.async.ManifestElement;
+import freenet.keys.FreenetURI;
+import freenet.support.api.Bucket;
+
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Ordering;
 import com.google.common.eventbus.EventBus;
 
-import freenet.client.async.ManifestElement;
-import freenet.keys.FreenetURI;
-
 /**
  * A Sone inserter is responsible for inserting a Sone if it has changed.
  *
@@ -90,7 +97,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;
@@ -123,8 +130,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)
@@ -167,20 +187,19 @@ public class SoneInserter extends AbstractService {
 	// SERVICE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected void serviceRun() {
 		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) {
@@ -229,7 +248,7 @@ public class SoneInserter extends AbstractService {
 							break;
 						}
 						sone.setTime(insertTime);
-						sone.setLatestEdition(finalUri.getEdition());
+						sone.modify().setLatestEdition(finalUri.getEdition()).update();
 						core.touchConfiguration();
 						success = true;
 						logger.log(Level.INFO, String.format("Inserted Sone “%s” at %s.", sone.getName(), finalUri));
@@ -237,6 +256,7 @@ public class SoneInserter extends AbstractService {
 						eventBus.post(new SoneInsertAbortedEvent(sone, se1));
 						logger.log(Level.WARNING, String.format("Could not insert Sone “%s”!", sone.getName()), se1);
 					} finally {
+						insertInformation.freeBuckets();
 						sone.setStatus(SoneStatus.idle);
 					}
 
@@ -273,6 +293,7 @@ public class SoneInserter extends AbstractService {
 
 		/** All properties of the Sone, copied for thread safety. */
 		private final Map<String, Object> soneProperties = new HashMap<String, Object>();
+		private final Set<Bucket> buckets = new HashSet<Bucket>();
 
 		/**
 		 * Creates a new insert information container.
@@ -284,14 +305,14 @@ public class SoneInserter extends AbstractService {
 			soneProperties.put("id", sone.getId());
 			soneProperties.put("name", sone.getName());
 			soneProperties.put("time", sone.getTime());
-			soneProperties.put("requestUri", sone.getRequestUri());
-			soneProperties.put("insertUri", sone.getInsertUri());
+			soneProperties.put("requestUri", TO_FREENET_URI.apply(sone));
+			soneProperties.put("insertUri", TO_INSERT_URI.apply(sone));
 			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()));
 			soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
 			soneProperties.put("likedReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
-			soneProperties.put("albums", FluentIterable.from(sone.getAlbums()).transformAndConcat(Album.FLATTENER).toList());
+			soneProperties.put("albums", FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).filter(NOT_EMPTY).toList());
 		}
 
 		//
@@ -338,6 +359,12 @@ public class SoneInserter extends AbstractService {
 			return manifestEntries;
 		}
 
+		public void freeBuckets() {
+			for (Bucket bucket : buckets) {
+				bucket.free();
+			}
+		}
+
 		//
 		// PRIVATE METHODS
 		//
@@ -383,9 +410,6 @@ public class SoneInserter extends AbstractService {
 				return null;
 			} finally {
 				Closer.close(writer);
-				if (bucket != null) {
-					bucket.free();
-				}
 			}
 		}