Remove “modified” flag, it’s now calculated on-the-fly.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / SoneInserter.java

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 59524b3..d9235fd 100644 (file)
--- 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.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;
@@ -52,6 +54,7 @@ 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;
@@ -96,9 +99,6 @@ public class SoneInserter extends AbstractService {
        /** 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;
 
@@ -177,7 +177,7 @@ public class SoneInserter extends AbstractService {
         *         otherwise
         */
        public boolean isModified() {
-               return modified;
+               return !lastInsertFingerprint.equals(sone.getFingerprint());
        }
 
        //
@@ -189,7 +189,7 @@ public class SoneInserter extends AbstractService {
         */
        @Override
        protected void serviceRun() {
-               long lastModificationTime = 0;
+               Optional<Long> lastModificationTime = absent();
                String lastInsertedFingerprint = lastInsertFingerprint;
                String lastFingerprint = "";
                while (!shouldStop()) {
@@ -201,36 +201,32 @@ public class SoneInserter extends AbstractService {
                                Sone sone = this.sone;
                                if (core.isLocked(sone)) {
                                        /* trigger redetection when the Sone is unlocked. */
-                                       synchronized (sone) {
-                                               modified = !sone.getFingerprint().equals(lastInsertedFingerprint);
-                                       }
                                        lastFingerprint = "";
-                                       lastModificationTime = 0;
+                                       lastModificationTime = absent();
                                        continue;
                                }
 
-                               InsertInformation insertInformation = null;
+                               boolean insertSoneNow = false;
                                synchronized (sone) {
                                        String fingerprint = sone.getFingerprint();
                                        if (!fingerprint.equals(lastFingerprint)) {
                                                if (fingerprint.equals(lastInsertedFingerprint)) {
-                                                       modified = false;
-                                                       lastModificationTime = 0;
+                                                       lastModificationTime = absent();
                                                        logger.log(Level.FINE, String.format("Sone %s has been reverted to last insert state.", sone));
                                                } else {
-                                                       lastModificationTime = System.currentTimeMillis();
-                                                       modified = true;
+                                                       lastModificationTime = of(currentTimeMillis());
                                                        logger.log(Level.FINE, String.format("Sone %s has been modified, waiting %d seconds before inserting.", sone.getName(), insertionDelay));
                                                }
                                                lastFingerprint = fingerprint;
                                        }
-                                       if (modified && (lastModificationTime > 0) && ((System.currentTimeMillis() - lastModificationTime) > (insertionDelay * 1000))) {
+                                       if (lastModificationTime.isPresent() && ((currentTimeMillis() - lastModificationTime.get()) > (insertionDelay * 1000))) {
                                                lastInsertedFingerprint = fingerprint;
-                                               insertInformation = new InsertInformation(sone);
+                                               insertSoneNow = true;
                                        }
                                }
 
-                               if (insertInformation != null) {
+                               if (insertSoneNow) {
+                                       InsertInformation insertInformation = new InsertInformation(sone);
                                        logger.log(Level.INFO, String.format("Inserting Sone “%s”…", sone.getName()));
 
                                        boolean success = false;
@@ -264,12 +260,11 @@ 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 = 0;
-                                                               lastInsertFingerprint = lastInsertedFingerprint;
+                                                               lastModificationTime = absent();
+                                                               lastInsertFingerprint = insertInformation.getFingerprint();
                                                                core.touchConfiguration();
-                                                               modified = false;
                                                        }
                                                }
                                        }
@@ -289,6 +284,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>();
 
@@ -299,6 +296,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());
@@ -316,6 +314,10 @@ public class SoneInserter extends AbstractService {
                // ACCESSORS
                //
 
+               private String getFingerprint() {
+                       return fingerprint;
+               }
+
                /**
                 * Returns the insert URI of the Sone.
                 *