Mark new posts as new.

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

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 450e996..841f560 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -113,6 +113,13 @@ public class Core implements IdentityListener {
        /* synchronize access on {@link #newSones}. */
        private Set<String> knownSones = new HashSet<String>();
 
+       /** 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 posts. */
        private Map<String, Post> posts = new HashMap<String, Post>();
 
@@ -405,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
@@ -607,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;
@@ -617,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) {
@@ -784,6 +813,11 @@ public class Core implements IdentityListener {
                                knownSones.add(friend);
                        }
                }
+               synchronized (newPosts) {
+                       for (Post post : posts) {
+                               knownPosts.add(post.getId());
+                       }
+               }
        }
 
        /**
@@ -857,8 +891,8 @@ public class Core implements IdentityListener {
 
                        /* save friends. */
                        int friendCounter = 0;
-                       for (String friend : sone.getFriends()) {
-                               configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(friend);
+                       for (String friendId : sone.getFriends()) {
+                               configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter++ + "/ID").setValue(friendId);
                        }
                        configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
 
@@ -1043,6 +1077,19 @@ public class Core implements IdentityListener {
                                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);
+                       }
+               }
+
        }
 
        /**
@@ -1064,6 +1111,15 @@ public class Core implements IdentityListener {
                                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);
                }