X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=7001be173ac3116c442d05d4eb22db73a800e82b;hb=2bccc50e24eec9fc0f20df72fd67c6887c1254dd;hp=1445613f52c7684a824b414705b518b71a130047;hpb=8f2392b1ad71157ffdbc78f8074d5a35543c8c75;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 1445613..7001be1 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -17,8 +17,6 @@
 
 package net.pterodactylus.sone.core;
 
-import static com.google.common.base.Optional.absent;
-import static com.google.common.base.Optional.of;
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.lang.System.currentTimeMillis;
 import static net.pterodactylus.sone.data.Album.NOT_EMPTY;
@@ -29,6 +27,7 @@ import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -54,7 +53,6 @@ import net.pterodactylus.util.template.TemplateException;
 import net.pterodactylus.util.template.TemplateParser;
 import net.pterodactylus.util.template.XmlFilter;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Ordering;
 import com.google.common.eventbus.EventBus;
@@ -73,7 +71,7 @@ public class SoneInserter extends AbstractService {
 	private static final Logger logger = Logging.getLogger(SoneInserter.class);
 
 	/** The insertion delay (in seconds). */
-	private static volatile int insertionDelay = 60;
+	private static final AtomicInteger insertionDelay = new AtomicInteger(60);
 
 	/** The template factory used to create the templates. */
 	private static final TemplateContextFactory templateContextFactory = new TemplateContextFactory();
@@ -96,15 +94,11 @@ public class SoneInserter extends AbstractService {
 	/** The Freenet interface. */
 	private final FreenetInterface freenetInterface;
 
+	private final SoneModificationDetector soneModificationDetector;
+
 	/** The Sone to insert. */
 	private volatile Sone sone;
 
-	/** Whether a modification has been detected. */
-	private volatile boolean modified = false;
-
-	/** The fingerprint of the last insert. */
-	private volatile String lastInsertFingerprint;
-
 	/**
 	 * Creates a new Sone inserter.
 	 *
@@ -123,6 +117,7 @@ public class SoneInserter extends AbstractService {
 		this.eventBus = eventBus;
 		this.freenetInterface = freenetInterface;
 		this.sone = sone;
+		this.soneModificationDetector = new SoneModificationDetector(core, sone, insertionDelay);
 	}
 
 	//
@@ -150,7 +145,7 @@ public class SoneInserter extends AbstractService {
 	 *            The insertion delay (in seconds)
 	 */
 	public static void setInsertionDelay(int insertionDelay) {
-		SoneInserter.insertionDelay = insertionDelay;
+		SoneInserter.insertionDelay.set(insertionDelay);
 	}
 
 	/**
@@ -159,7 +154,7 @@ public class SoneInserter extends AbstractService {
 	 * @return The fingerprint of the last insert
 	 */
 	public String getLastInsertFingerprint() {
-		return lastInsertFingerprint;
+		return soneModificationDetector.getOriginalFingerprint();
 	}
 
 	/**
@@ -169,7 +164,7 @@ public class SoneInserter extends AbstractService {
 	 *            The fingerprint of the last insert
 	 */
 	public void setLastInsertFingerprint(String lastInsertFingerprint) {
-		this.lastInsertFingerprint = lastInsertFingerprint;
+		soneModificationDetector.setFingerprint(lastInsertFingerprint);
 	}
 
 	/**
@@ -180,7 +175,7 @@ public class SoneInserter extends AbstractService {
 	 *         otherwise
 	 */
 	public boolean isModified() {
-		return modified;
+		return soneModificationDetector.isModified();
 	}
 
 	//
@@ -192,48 +187,12 @@ public class SoneInserter extends AbstractService {
 	 */
 	@Override
 	protected void serviceRun() {
-		Optional<Long> lastModificationTime = absent();
-		String lastInsertedFingerprint = lastInsertFingerprint;
-		String lastFingerprint = "";
 		while (!shouldStop()) {
 			try {
 				/* check every second. */
 				sleep(1000);
 
-				/* don’t insert locked Sones. */
-				Sone sone = this.sone;
-				if (core.isLocked(sone)) {
-					/* trigger redetection when the Sone is unlocked. */
-					synchronized (sone) {
-						modified = !sone.getFingerprint().equals(lastInsertedFingerprint);
-					}
-					lastFingerprint = "";
-					lastModificationTime = absent();
-					continue;
-				}
-
-				boolean insertSoneNow = false;
-				synchronized (sone) {
-					String fingerprint = sone.getFingerprint();
-					if (!fingerprint.equals(lastFingerprint)) {
-						if (fingerprint.equals(lastInsertedFingerprint)) {
-							modified = false;
-							lastModificationTime = absent();
-							logger.log(Level.FINE, String.format("Sone %s has been reverted to last insert state.", sone));
-						} else {
-							lastModificationTime = of(currentTimeMillis());
-							modified = true;
-							logger.log(Level.FINE, String.format("Sone %s has been modified, waiting %d seconds before inserting.", sone.getName(), insertionDelay));
-						}
-						lastFingerprint = fingerprint;
-					}
-					if (modified && lastModificationTime.isPresent() && ((currentTimeMillis() - lastModificationTime.get()) > (insertionDelay * 1000))) {
-						lastInsertedFingerprint = fingerprint;
-						insertSoneNow = true;
-					}
-				}
-
-				if (insertSoneNow) {
+				if (soneModificationDetector.isEligibleForInsert()) {
 					InsertInformation insertInformation = new InsertInformation(sone);
 					logger.log(Level.INFO, String.format("Inserting Sone “%s”…", sone.getName()));
 
@@ -268,12 +227,10 @@ public class SoneInserter extends AbstractService {
 					 */
 					if (success) {
 						synchronized (sone) {
-							if (lastInsertedFingerprint.equals(sone.getFingerprint())) {
+							if (insertInformation.getFingerprint().equals(sone.getFingerprint())) {
 								logger.log(Level.FINE, String.format("Sone “%s” was not modified further, resetting counter…", sone));
-								lastModificationTime = absent();
-								lastInsertFingerprint = lastInsertedFingerprint;
+								soneModificationDetector.setFingerprint(insertInformation.getFingerprint());
 								core.touchConfiguration();
-								modified = false;
 							}
 						}
 					}
@@ -293,6 +250,8 @@ public class SoneInserter extends AbstractService {
 	 */
 	private 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>();
 
@@ -303,6 +262,7 @@ public class SoneInserter extends AbstractService {
 		 *            The sone to insert
 		 */
 		public InsertInformation(Sone sone) {
+			this.fingerprint = sone.getFingerprint();
 			soneProperties.put("id", sone.getId());
 			soneProperties.put("name", sone.getName());
 			soneProperties.put("time", sone.getTime());
@@ -320,6 +280,10 @@ public class SoneInserter extends AbstractService {
 		// ACCESSORS
 		//
 
+		private String getFingerprint() {
+			return fingerprint;
+		}
+
 		/**
 		 * Returns the insert URI of the Sone.
 		 *