Fix insertion logic.

[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 839c216..c2e0cc6 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -20,12 +20,18 @@ package net.pterodactylus.sone.core;
 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;
 
 import net.pterodactylus.sone.core.Core.SoneStatus;
+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;
@@ -82,7 +88,7 @@ public class SoneInserter extends AbstractService {
         *            The Sone to insert
         */
        public SoneInserter(Core core, FreenetInterface freenetInterface, Sone sone) {
-               super("Sone Inserter for “" + sone.getName() + "”");
+               super("Sone Inserter for “" + sone.getName() + "”", false);
                this.core = core;
                this.freenetInterface = freenetInterface;
                this.sone = sone;
@@ -98,21 +104,24 @@ public class SoneInserter extends AbstractService {
        @Override
        protected void serviceRun() {
                long modificationCounter = 0;
-               boolean restartNow = true;
+               long lastModificationTime = 0;
                while (!shouldStop()) {
-                       if (!restartNow) {
-                               logger.log(Level.FINEST, "Waiting 60 seconds before checking Sone “" + sone.getName() + "”.");
-                               sleep(60 * 1000);
-                       }
-                       restartNow = false;
+                       /* check every seconds. */
+                       sleep(1000);
+
                        InsertInformation insertInformation = null;
                        synchronized (sone) {
-                               modificationCounter = sone.getModificationCounter();
-                               if (modificationCounter > 0) {
-                                       sone.setTime(System.currentTimeMillis());
-                                       insertInformation = new InsertInformation(sone.getRequestUri(), sone.getInsertUri());
+                               if (sone.getModificationCounter() > modificationCounter) {
+                                       modificationCounter = sone.getModificationCounter();
+                                       lastModificationTime = System.currentTimeMillis();
+                                       sone.setTime(lastModificationTime);
+                                       logger.log(Level.FINE, "Sone %s has been modified, waiting 60 seconds before inserting.", new Object[] { sone.getName() });
+                               }
+                               if ((lastModificationTime > 0) && ((System.currentTimeMillis() - lastModificationTime) > (60 * 1000))) {
+                                       insertInformation = new InsertInformation(sone);
                                }
                        }
+
                        if (insertInformation != null) {
                                logger.log(Level.INFO, "Inserting Sone “%s”…", new Object[] { sone.getName() });
 
@@ -138,9 +147,8 @@ public class SoneInserter extends AbstractService {
                                                if (sone.getModificationCounter() == modificationCounter) {
                                                        logger.log(Level.FINE, "Sone “%s” was not modified further, resetting counter…", new Object[] { sone });
                                                        sone.setModificationCounter(0);
-                                               } else {
-                                                       logger.log(Level.FINE, "Sone “%s” was modified since the insert started, starting another insert…", new Object[] { sone });
-                                                       restartNow = true;
+                                                       modificationCounter = 0;
+                                                       lastModificationTime = 0;
                                                }
                                        }
                                }
@@ -157,23 +165,27 @@ public class SoneInserter extends AbstractService {
         */
        private class InsertInformation {
 
-               /** The request URI of the Sone. */
-               private final FreenetURI requestUri;
-
-               /** The insert URI of the Sone. */
-               private final FreenetURI insertUri;
+               /** All properties of the Sone, copied for thread safety. */
+               private final Map<String, Object> soneProperties = new HashMap<String, Object>();
 
                /**
                 * Creates a new insert information container.
                 *
-                * @param requestUri
-                *            The request URI of the Sone
-                * @param insertUri
-                *            The insert URI of the Sone
+                * @param sone
+                *            The sone to insert
                 */
-               public InsertInformation(FreenetURI requestUri, FreenetURI insertUri) {
-                       this.requestUri = requestUri;
-                       this.insertUri = insertUri;
+               public InsertInformation(Sone sone) {
+                       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("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()));
                }
 
                //
@@ -181,22 +193,12 @@ public class SoneInserter extends AbstractService {
                //
 
                /**
-                * Returns the request URI of the Sone.
-                *
-                * @return The request URI of the Sone
-                */
-               @SuppressWarnings("unused")
-               public FreenetURI getRequestUri() {
-                       return requestUri;
-               }
-
-               /**
                 * Returns the insert URI of the Sone.
                 *
                 * @return The insert URI of the Sone
                 */
                public FreenetURI getInsertUri() {
-                       return insertUri;
+                       return (FreenetURI) soneProperties.get("insertUri");
                }
 
                //
@@ -247,6 +249,8 @@ 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>() {
 
                                /**
@@ -254,11 +258,11 @@ public class SoneInserter extends AbstractService {
                                 */
                                @Override
                                public boolean filterObject(Sone object) {
-                                       return !sone.isSoneBlocked(object.getId()) && !object.equals(sone);
+                                       return !blockedSoneIds.contains(object.getId()) && !object.getId().equals(soneProperties.get("id"));
                                }
                        });
 
-                       template.set("currentSone", sone);
+                       template.set("currentSone", soneProperties);
                        template.set("knownSones", knownSones);
                        StringWriter writer = new StringWriter();
                        StringBucket bucket = null;