X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=86ea92a41e5b10947495c678af0d43d4c45fad0e;hb=4f686e5c5ddcf94ffdf074b953493c148fb2ab32;hp=2a1f1fb8974cfdd86a66e4c5c9bb575597ef31c7;hpb=2c5b76a2fbce16ef33f079a3de9ae9fc9a9d30b8;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 2a1f1fb..86ea92a 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -32,7 +32,6 @@ 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.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
@@ -77,6 +76,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.
 	 *
@@ -109,6 +114,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
 	//
@@ -118,21 +153,30 @@ public class SoneInserter extends AbstractService {
 	 */
 	@Override
 	protected void serviceRun() {
-		long modificationCounter = 0;
 		long lastModificationTime = 0;
+		String lastFingerprint = "";
 		while (!shouldStop()) {
 			/* check every seconds. */
 			sleep(1000);
 
 			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);
 				}
 			}
@@ -144,9 +188,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());
-					/* TODO - better encapsulation? */
-					core.getIdentityManager().setProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition", String.valueOf(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) {
@@ -161,11 +208,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;
 						}
 					}
 				}