Add method to reload a known Sone.

[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 cf61941..d098456 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.core;
 
 import java.net.MalformedURLException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -37,6 +38,8 @@ import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
+import net.pterodactylus.util.filter.Filter;
+import net.pterodactylus.util.filter.Filters;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
 import freenet.client.FetchResult;
@@ -135,14 +138,38 @@ public class Core extends AbstractService {
        public Sone getSone(String soneId) {
                if (!soneCache.containsKey(soneId)) {
                        Sone sone = new Sone(soneId);
-                       soneDownloader.addSone(sone);
                        soneCache.put(soneId, sone);
                }
                return soneCache.get(soneId);
        }
 
        /**
-        * Creates a new post.
+        * Returns all known sones.
+        *
+        * @return All known sones
+        */
+       public Collection<Sone> getKnownSones() {
+               return soneCache.values();
+       }
+
+       /**
+        * Gets all known Sones that are not local Sones.
+        *
+        * @return All remote Sones
+        */
+       public Collection<Sone> getRemoteSones() {
+               return Filters.filteredCollection(getKnownSones(), new Filter<Sone>() {
+
+                       @Override
+                       @SuppressWarnings("synthetic-access")
+                       public boolean filterObject(Sone object) {
+                               return !localSones.contains(object);
+                       }
+               });
+       }
+
+       /**
+        * Creates a new post and adds it to the given Sone.
         *
         * @param sone
         *            The sone that creates the post
@@ -155,7 +182,7 @@ public class Core extends AbstractService {
        }
 
        /**
-        * Creates a new post.
+        * Creates a new post and adds it to the given Sone.
         *
         * @param sone
         *            The Sone that creates the post
@@ -210,6 +237,20 @@ public class Core extends AbstractService {
        //
 
        /**
+        * Adds a Sone to watch for updates. The Sone needs to be completely
+        * initialized.
+        *
+        * @param sone
+        *            The Sone to watch for updates
+        */
+       public void addSone(Sone sone) {
+               soneCache.put(sone.getId(), sone);
+               if (!localSones.contains(sone)) {
+                       soneDownloader.addSone(sone);
+               }
+       }
+
+       /**
         * Adds the given Sone.
         *
         * @param sone
@@ -219,7 +260,6 @@ public class Core extends AbstractService {
                if (localSones.add(sone)) {
                        SoneInserter soneInserter = new SoneInserter(freenetInterface, sone);
                        soneInserter.start();
-                       soneDownloader.removeSone(sone);
                        soneInserters.put(sone, soneInserter);
                }
        }
@@ -283,18 +323,52 @@ public class Core extends AbstractService {
        }
 
        /**
-        * Loads the Sone from the given request URI.
+        * Loads the Sone from the given request URI. The fetching of the data is
+        * performed in a new thread so this method returns immediately.
         *
         * @param requestUri
         *            The request URI to load the Sone from
         */
-       public void loadSone(String requestUri) {
-               try {
-                       FetchResult fetchResult = freenetInterface.fetchUri(new FreenetURI(requestUri).setMetaString(new String[] { "sone.xml" }));
-                       soneDownloader.parseSone(null, fetchResult);
-               } catch (MalformedURLException mue1) {
-                       logger.log(Level.INFO, "Could not create URI from “" + requestUri + "”.", mue1);
-               }
+       public void loadSone(final String requestUri) {
+               new Thread(new Runnable() {
+
+                       @Override
+                       @SuppressWarnings("synthetic-access")
+                       public void run() {
+                               try {
+                                       FreenetURI realRequestUri = new FreenetURI(requestUri).setMetaString(new String[] { "sone.xml" });
+                                       FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri);
+                                       Sone parsedSone = soneDownloader.parseSone(null, fetchResult, realRequestUri);
+                                       if (parsedSone != null) {
+                                               addSone(parsedSone);
+                                       }
+                               } catch (MalformedURLException mue1) {
+                                       logger.log(Level.INFO, "Could not create URI from “" + requestUri + "”.", mue1);
+                               }
+                       }
+               }, "Sone Downloader").start();
+       }
+
+       /**
+        * Loads and updates the given Sone.
+        *
+        * @param sone
+        *            The Sone to load
+        */
+       public void loadSone(final Sone sone) {
+               new Thread(new Runnable() {
+
+                       @Override
+                       @SuppressWarnings("synthetic-access")
+                       public void run() {
+                               FreenetURI realRequestUri = sone.getRequestUri().setMetaString(new String[] { "sone.xml" });
+                               FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri);
+                               Sone parsedSone = soneDownloader.parseSone(sone, fetchResult, realRequestUri);
+                               if (parsedSone != null) {
+                                       addSone(parsedSone);
+                               }
+                       }
+               }, "Sone Downloader").start();
        }
 
        /**
@@ -462,7 +536,7 @@ public class Core extends AbstractService {
                                        String friendKey = configuration.getStringValue(friendPrefix + "/Key").getValue(null);
                                        String friendName = configuration.getStringValue(friendPrefix + "/Name").getValue(null);
                                        friendSone.setRequestUri(new FreenetURI(friendKey)).setName(friendName);
-                                       soneDownloader.addSone(friendSone);
+                                       loadSone(friendKey);
                                        sone.addFriend(friendSone);
                                }