Move newPosts and knownPosts below posts.
[Sone.git] / src / main / java / net / pterodactylus / sone / core / Core.java
index 93891ab..e34e94b 100644 (file)
@@ -107,15 +107,22 @@ public class Core implements IdentityListener {
        private Map<String, Sone> remoteSones = new HashMap<String, Sone>();
 
        /** All new Sones. */
-       private Set<Sone> newSones = new HashSet<Sone>();
+       private Set<String> newSones = new HashSet<String>();
 
        /** All known Sones. */
        /* synchronize access on {@link #newSones}. */
-       private Set<Sone> knownSones = new HashSet<Sone>();
+       private Set<String> knownSones = new HashSet<String>();
 
        /** All posts. */
        private Map<String, Post> posts = new HashMap<String, Post>();
 
+       /** All new posts. */
+       private Set<String> newPosts = new HashSet<String>();
+
+       /** All known posts. */
+       /* synchronize access on {@link #newPosts}. */
+       private Set<String> knownPosts = new HashSet<String>();
+
        /** All replies. */
        private Map<String, Reply> replies = new HashMap<String, Reply>();
 
@@ -207,10 +214,39 @@ public class Core implements IdentityListener {
         *         Sone
         */
        public Sone getSone(String id) {
+               return getSone(id, true);
+       }
+
+       /**
+        * Returns the Sone with the given ID, regardless whether it’s local or
+        * remote.
+        *
+        * @param id
+        *            The ID of the Sone to get
+        * @param create
+        *            {@code true} to create a new Sone if none exists,
+        *            {@code false} to return {@code null} if a Sone with the given
+        *            ID does not exist
+        * @return The Sone with the given ID, or {@code null} if there is no such
+        *         Sone
+        */
+       public Sone getSone(String id, boolean create) {
                if (isLocalSone(id)) {
                        return getLocalSone(id);
                }
-               return getRemoteSone(id);
+               return getRemoteSone(id, create);
+       }
+
+       /**
+        * Checks whether the core knows a Sone with the given ID.
+        *
+        * @param id
+        *            The ID of the Sone
+        * @return {@code true} if there is a Sone with the given ID, {@code false}
+        *         otherwise
+        */
+       public boolean hasSone(String id) {
+               return isLocalSone(id) || isRemoteSone(id);
        }
 
        /**
@@ -288,9 +324,23 @@ public class Core implements IdentityListener {
         * @return The Sone with the given ID
         */
        public Sone getRemoteSone(String id) {
+               return getRemoteSone(id, true);
+       }
+
+       /**
+        * Returns the remote Sone with the given ID.
+        *
+        * @param id
+        *            The ID of the remote Sone to get
+        * @param create
+        *            {@code true} to always create a Sone, {@code false} to return
+        *            {@code null} if no Sone with the given ID exists
+        * @return The Sone with the given ID
+        */
+       public Sone getRemoteSone(String id, boolean create) {
                synchronized (remoteSones) {
                        Sone sone = remoteSones.get(id);
-                       if (sone == null) {
+                       if ((sone == null) && create) {
                                sone = new Sone(id);
                                remoteSones.put(id, sone);
                        }
@@ -337,8 +387,8 @@ public class Core implements IdentityListener {
         */
        public boolean isNewSone(Sone sone) {
                synchronized (newSones) {
-                       boolean isNew = !knownSones.contains(sone) && newSones.remove(sone);
-                       knownSones.add(sone);
+                       boolean isNew = !knownSones.contains(sone.getId()) && newSones.remove(sone.getId());
+                       knownSones.add(sone.getId());
                        return isNew;
                }
        }
@@ -362,6 +412,23 @@ public class Core implements IdentityListener {
        }
 
        /**
+        * Returns whether the given post ID is new. After this method returns it is
+        * marked a known post ID.
+        *
+        * @param postId
+        *            The post ID
+        * @return {@code true} if the post is considered to be new, {@code false}
+        *         otherwise
+        */
+       public boolean isNewPost(String postId) {
+               synchronized (newPosts) {
+                       boolean isNew = !knownPosts.contains(postId) && newPosts.remove(postId);
+                       knownPosts.add(postId);
+                       return isNew;
+               }
+       }
+
+       /**
         * Returns the reply with the given ID.
         *
         * @param replyId
@@ -538,7 +605,7 @@ public class Core implements IdentityListener {
                        sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
                        if (newSone) {
                                synchronized (newSones) {
-                                       newSones.add(sone);
+                                       newSones.add(sone.getId());
                                }
                        }
                        remoteSones.put(identity.getId(), sone);
@@ -564,8 +631,8 @@ public class Core implements IdentityListener {
         *            The updated Sone
         */
        public void updateSone(Sone sone) {
-               if (isRemoteSone(sone)) {
-                       Sone storedSone = getRemoteSone(sone.getId());
+               if (hasSone(sone.getId())) {
+                       Sone storedSone = getSone(sone.getId());
                        if (!(sone.getTime() > storedSone.getTime())) {
                                logger.log(Level.FINE, "Downloaded Sone %s is not newer than stored Sone %s.", new Object[] { sone, storedSone });
                                return;
@@ -574,8 +641,13 @@ public class Core implements IdentityListener {
                                for (Post post : storedSone.getPosts()) {
                                        posts.remove(post.getId());
                                }
-                               for (Post post : sone.getPosts()) {
-                                       posts.put(post.getId(), post);
+                               synchronized (newPosts) {
+                                       for (Post post : sone.getPosts()) {
+                                               if (!storedSone.getPosts().contains(post) && !knownSones.contains(post.getId())) {
+                                                       newPosts.add(post.getId());
+                                               }
+                                               posts.put(post.getId(), post);
+                                       }
                                }
                        }
                        synchronized (replies) {
@@ -716,18 +788,13 @@ public class Core implements IdentityListener {
                }
 
                /* load friends. */
-               Set<Sone> friends = new HashSet<Sone>();
+               Set<String> friends = new HashSet<String>();
                while (true) {
                        String friendId = configuration.getStringValue(sonePrefix + "/Friends/" + friends.size() + "/ID").getValue(null);
                        if (friendId == null) {
                                break;
                        }
-                       Boolean friendLocal = configuration.getBooleanValue(sonePrefix + "/Friends/" + friends.size() + "/Local").getValue(null);
-                       if (friendLocal == null) {
-                               logger.log(Level.WARNING, "Invalid friend found, aborting load!");
-                               return;
-                       }
-                       friends.add(friendLocal ? getLocalSone(friendId) : getRemoteSone(friendId));
+                       friends.add(friendId);
                }
 
                /* if we’re still here, Sone was loaded successfully. */
@@ -742,10 +809,15 @@ public class Core implements IdentityListener {
                        sone.setModificationCounter(soneModificationCounter);
                }
                synchronized (newSones) {
-                       for (Sone friend : friends) {
+                       for (String friend : friends) {
                                knownSones.add(friend);
                        }
                }
+               synchronized (newPosts) {
+                       for (Post post : posts) {
+                               knownPosts.add(post.getId());
+                       }
+               }
        }
 
        /**
@@ -819,9 +891,8 @@ public class Core implements IdentityListener {
 
                        /* save friends. */
                        int friendCounter = 0;
-                       for (Sone friend : sone.getFriends()) {
-                               configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(friend.getId());
-                               configuration.getBooleanValue(sonePrefix + "/Friends/" + friendCounter++ + "/Local").setValue(friend.getInsertUri() != null);
+                       for (String friendId : sone.getFriends()) {
+                               configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter++ + "/ID").setValue(friendId);
                        }
                        configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
 
@@ -1003,9 +1074,22 @@ public class Core implements IdentityListener {
                                break;
                        }
                        synchronized (newSones) {
-                               knownSones.add(getRemoteSone(knownSoneId));
+                               knownSones.add(knownSoneId);
                        }
                }
+
+               /* load known posts. */
+               int postCounter = 0;
+               while (true) {
+                       String knownPostId = configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").getValue(null);
+                       if (knownPostId == null) {
+                               break;
+                       }
+                       synchronized (newPosts) {
+                               knownPosts.add(knownPostId);
+                       }
+               }
+
        }
 
        /**
@@ -1021,12 +1105,21 @@ public class Core implements IdentityListener {
                        /* save known Sones. */
                        int soneCounter = 0;
                        synchronized (newSones) {
-                               for (Sone knownSone : knownSones) {
-                                       configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSone.getId());
+                               for (String knownSoneId : knownSones) {
+                                       configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSoneId);
                                }
                                configuration.getStringValue("KnownSone/" + soneCounter + "/ID").setValue(null);
                        }
 
+                       /* save known posts. */
+                       int postCounter = 0;
+                       synchronized (newPosts) {
+                               for (String knownPostId : knownPosts) {
+                                       configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").setValue(knownPostId);
+                               }
+                               configuration.getStringValue("KnownPosts/" + postCounter + "/ID").setValue(null);
+                       }
+
                } catch (ConfigurationException ce1) {
                        logger.log(Level.SEVERE, "Could not store configuration!", ce1);
                }