X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=fec4e8f66c6d887fa7c0448db03a378df5767465;hb=7379bb70d4db3b419deed77f0df95f74c4b0e038;hp=05e36008a11ae686b69bf43dcd1b9f783202031d;hpb=544c75a3b539a2948d08f688e7c367baa3dac28b;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 05e3600..fec4e8f 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -21,11 +21,9 @@ import java.io.InputStreamReader;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
-import java.util.Collection;
 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;
 
@@ -34,8 +32,7 @@ import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.StringBucket;
-import net.pterodactylus.util.filter.Filter;
-import net.pterodactylus.util.filter.Filters;
+import net.pterodactylus.sone.main.SonePlugin;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
@@ -80,6 +77,12 @@ public class SoneInserter extends AbstractService {
 	/** The Sone to insert. */
 	private final 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.
 	 *
@@ -112,6 +115,36 @@ public class SoneInserter extends AbstractService {
 		SoneInserter.insertionDelay = insertionDelay;
 	}
 
+	/**
+	 * Returns the fingerprint of the last insert.
+	 *
+	 * @return The fingerprint of the last insert
+	 */
+	public String getLastInsertFingerprint() {
+		return lastInsertFingerprint;
+	}
+
+	/**
+	 * Sets the fingerprint of the last insert.
+	 *
+	 * @param lastInsertFingerprint
+	 *            The fingerprint of the last insert
+	 */
+	public void setLastInsertFingerprint(String lastInsertFingerprint) {
+		this.lastInsertFingerprint = lastInsertFingerprint;
+	}
+
+	/**
+	 * Returns whether the Sone inserter has detected a modification of the
+	 * Sone.
+	 *
+	 * @return {@code true} if the Sone has been modified, {@code false}
+	 *         otherwise
+	 */
+	public boolean isModified() {
+		return modified;
+	}
+
 	//
 	// SERVICE METHODS
 	//
@@ -121,21 +154,41 @@ public class SoneInserter extends AbstractService {
 	 */
 	@Override
 	protected void serviceRun() {
-		long modificationCounter = 0;
 		long lastModificationTime = 0;
+		String lastFingerprint = "";
 		while (!shouldStop()) {
 			/* check every seconds. */
 			sleep(1000);
 
+			/* don’t insert locked Sones. */
+			if (core.isLocked(sone)) {
+				/* trigger redetection when the Sone is unlocked. */
+				synchronized (sone) {
+					modified = !sone.getFingerprint().equals(lastInsertFingerprint);
+				}
+				lastFingerprint = "";
+				lastModificationTime = 0;
+				continue;
+			}
+
 			InsertInformation insertInformation = null;
 			synchronized (sone) {
-				if (sone.getModificationCounter() > modificationCounter) {
-					modificationCounter = sone.getModificationCounter();
-					lastModificationTime = System.currentTimeMillis();
-					sone.setTime(lastModificationTime);
-					logger.log(Level.FINE, "Sone %s has been modified, waiting %d seconds before inserting.", new Object[] { sone.getName(), insertionDelay });
+				String fingerprint = sone.getFingerprint();
+				if (!fingerprint.equals(lastFingerprint)) {
+					if (fingerprint.equals(lastInsertFingerprint)) {
+						modified = false;
+						lastModificationTime = 0;
+						logger.log(Level.FINE, "Sone %s has been reverted to last insert state.", sone);
+					} else {
+						lastModificationTime = System.currentTimeMillis();
+						modified = true;
+						sone.setTime(lastModificationTime);
+						logger.log(Level.FINE, "Sone %s has been modified, waiting %d seconds before inserting.", new Object[] { sone.getName(), insertionDelay });
+					}
+					lastFingerprint = fingerprint;
 				}
-				if ((lastModificationTime > 0) && ((System.currentTimeMillis() - lastModificationTime) > (insertionDelay * 1000))) {
+				if (modified && (lastModificationTime > 0) && ((System.currentTimeMillis() - lastModificationTime) > (insertionDelay * 1000))) {
+					lastInsertFingerprint = fingerprint;
 					insertInformation = new InsertInformation(sone);
 				}
 			}
@@ -147,7 +200,12 @@ public class SoneInserter extends AbstractService {
 				try {
 					core.setSoneStatus(sone, SoneStatus.inserting);
 					FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri().setKeyType("USK").setSuggestedEdition(0), insertInformation.generateManifestEntries(), "index.html");
-					sone.updateUris(finalUri.getEdition());
+					/* at this point we might already be stopped. */
+					if (shouldStop()) {
+						/* if so, bail out, don’t change anything. */
+						break;
+					}
+					sone.setLatestEdition(finalUri.getEdition());
 					success = true;
 					logger.log(Level.INFO, "Inserted Sone “%s” at %s.", new Object[] { sone.getName(), finalUri });
 				} catch (SoneException se1) {
@@ -162,11 +220,11 @@ public class SoneInserter extends AbstractService {
 				 */
 				if (success) {
 					synchronized (sone) {
-						if (sone.getModificationCounter() == modificationCounter) {
+						if (lastInsertFingerprint.equals(sone.getFingerprint())) {
 							logger.log(Level.FINE, "Sone “%s” was not modified further, resetting counter…", new Object[] { sone });
-							sone.setModificationCounter(0);
-							modificationCounter = 0;
+							core.saveSone(sone);
 							lastModificationTime = 0;
+							modified = false;
 						}
 					}
 				}
@@ -201,9 +259,8 @@ public class SoneInserter extends AbstractService {
 			soneProperties.put("profile", sone.getProfile());
 			soneProperties.put("posts", new ArrayList<Post>(sone.getPosts()));
 			soneProperties.put("replies", new HashSet<Reply>(sone.getReplies()));
-			soneProperties.put("blockedSoneIds", new HashSet<String>(sone.getBlockedSoneIds()));
 			soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
-			soneProperties.put("likeReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
+			soneProperties.put("likedReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
 		}
 
 		//
@@ -267,21 +324,9 @@ public class SoneInserter extends AbstractService {
 			} finally {
 				Closer.close(templateInputStreamReader);
 			}
-			@SuppressWarnings("unchecked")
-			final Set<String> blockedSoneIds = (Set<String>) soneProperties.get("blockedSoneIds");
-			Collection<Sone> knownSones = Filters.filteredCollection(core.getKnownSones(), new Filter<Sone>() {
-
-				/**
-				 * {@inheritDoc}
-				 */
-				@Override
-				public boolean filterObject(Sone object) {
-					return !blockedSoneIds.contains(object.getId()) && !object.getId().equals(soneProperties.get("id"));
-				}
-			});
 
 			template.set("currentSone", soneProperties);
-			template.set("knownSones", knownSones);
+			template.set("version", SonePlugin.VERSION);
 			StringWriter writer = new StringWriter();
 			StringBucket bucket = null;
 			try {