Add method that returns all remote Sones, change javadoc for createSone().
[Sone.git] / src / main / java / net / pterodactylus / sone / core / Core.java
index a0f0a59..362df22 100644 (file)
@@ -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,8 +38,11 @@ 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;
 import freenet.keys.FreenetURI;
 
 /**
@@ -140,7 +144,32 @@ public class Core extends AbstractService {
        }
 
        /**
-        * 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
@@ -153,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
@@ -164,7 +193,43 @@ public class Core extends AbstractService {
         * @return The created post
         */
        public Post createPost(Sone sone, long time, String text) {
-               return getPost(UUID.randomUUID().toString()).setSone(sone).setTime(time).setText(text);
+               Post post = getPost(UUID.randomUUID().toString()).setSone(sone).setTime(time).setText(text);
+               sone.addPost(post);
+               return post;
+       }
+
+       /**
+        * Creates a reply.
+        *
+        * @param sone
+        *            The Sone that posts the reply
+        * @param post
+        *            The post the reply refers to
+        * @param text
+        *            The text of the reply
+        * @return The created reply
+        */
+       public Reply createReply(Sone sone, Post post, String text) {
+               return createReply(sone, post, System.currentTimeMillis(), text);
+       }
+
+       /**
+        * Creates a reply.
+        *
+        * @param sone
+        *            The Sone that posts the reply
+        * @param post
+        *            The post the reply refers to
+        * @param time
+        *            The time of the post
+        * @param text
+        *            The text of the reply
+        * @return The created reply
+        */
+       public Reply createReply(Sone sone, Post post, long time, String text) {
+               Reply reply = getReply(UUID.randomUUID().toString()).setSone(sone).setPost(post).setTime(time).setText(text);
+               sone.addReply(reply);
+               return reply;
        }
 
        //
@@ -172,6 +237,18 @@ 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);
+               soneDownloader.addSone(sone);
+       }
+
+       /**
         * Adds the given Sone.
         *
         * @param sone
@@ -179,28 +256,13 @@ public class Core extends AbstractService {
         */
        public void addLocalSone(Sone sone) {
                if (localSones.add(sone)) {
-                       soneCache.put(sone.getId(), sone);
                        SoneInserter soneInserter = new SoneInserter(freenetInterface, sone);
                        soneInserter.start();
-                       soneDownloader.addSone(sone);
                        soneInserters.put(sone, soneInserter);
                }
        }
 
        /**
-        * Adds a remote Sone so that it is watched for updates.
-        *
-        * @param sone
-        *            The sone to watch
-        */
-       public void addSone(Sone sone) {
-               if (!soneCache.containsKey(sone.getId())) {
-                       soneCache.put(sone.getId(), sone);
-               }
-               soneDownloader.addSone(sone);
-       }
-
-       /**
         * Creates a new Sone at a random location.
         *
         * @param name
@@ -247,7 +309,7 @@ public class Core extends AbstractService {
                Sone sone;
                try {
                        logger.log(Level.FINEST, "Creating new Sone “%s” at %s (%s)…", new Object[] { name, finalRequestUri, finalInsertUri });
-                       sone = new Sone(UUID.randomUUID().toString()).setName(name).setRequestUri(new FreenetURI(finalRequestUri).setKeyType("USK").setDocName("Sone-" + name)).setInsertUri(new FreenetURI(finalInsertUri).setKeyType("USK").setDocName("Sone-" + name));
+                       sone = getSone(UUID.randomUUID().toString()).setName(name).setRequestUri(new FreenetURI(finalRequestUri).setKeyType("USK").setDocName("Sone-" + name)).setInsertUri(new FreenetURI(finalInsertUri).setKeyType("USK").setDocName("Sone-" + name));
                        sone.setProfile(new Profile());
                        /* set modification counter to 1 so it is inserted immediately. */
                        sone.setModificationCounter(1);
@@ -259,6 +321,33 @@ public class Core extends AbstractService {
        }
 
        /**
+        * 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(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();
+       }
+
+       /**
         * Deletes the given Sone from this plugin instance.
         *
         * @param sone
@@ -383,8 +472,7 @@ public class Core extends AbstractService {
                                profile.setFirstName(firstName);
                                profile.setMiddleName(middleName);
                                profile.setLastName(lastName);
-                               Sone sone = new Sone(id).setName(name).setRequestUri(new FreenetURI(requestUri)).setInsertUri(new FreenetURI(insertUri));
-                               soneCache.put(id, sone);
+                               Sone sone = getSone(id).setName(name).setRequestUri(new FreenetURI(requestUri)).setInsertUri(new FreenetURI(insertUri));
                                sone.setProfile(profile);
                                int postId = 0;
                                do {
@@ -405,15 +493,11 @@ public class Core extends AbstractService {
                                        if (replyId == null) {
                                                break;
                                        }
-                                       Sone replySone = getSone(configuration.getStringValue(replyPrefix + "/Sone/ID").getValue(null));
-                                       String replySoneKey = configuration.getStringValue(replyPrefix + "/Sone/Key").getValue(null);
-                                       String replySoneName = configuration.getStringValue(replyPrefix + "/Sone/Name").getValue(null);
-                                       replySone.setRequestUri(new FreenetURI(replySoneKey)).setName(replySoneName);
-                                       Post replyPost = postCache.get(configuration.getStringValue(replyPrefix + "/Post").getValue(null));
+                                       Post replyPost = getPost(configuration.getStringValue(replyPrefix + "/Post").getValue(null));
                                        long replyTime = configuration.getLongValue(replyPrefix + "/Time").getValue(null);
                                        String replyText = configuration.getStringValue(replyPrefix + "/Text").getValue(null);
-                                       Reply reply = getReply(replyId).setSone(replySone).setPost(replyPost).setTime(replyTime).setText(replyText);
-                                       replyCache.put(replyId, reply);
+                                       Reply reply = getReply(replyId).setSone(sone).setPost(replyPost).setTime(replyTime).setText(replyText);
+                                       sone.addReply(reply);
                                } while (true);
 
                                /* load friends. */
@@ -428,8 +512,8 @@ 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);
-                                       addSone(friendSone);
-                                       sone.addFriend(sone);
+                                       loadSone(friendKey);
+                                       sone.addFriend(friendSone);
                                }
 
                                sone.setModificationCounter(modificationCounter);
@@ -477,9 +561,6 @@ public class Core extends AbstractService {
                                for (Reply reply : sone.getReplies()) {
                                        String replyPrefix = sonePrefix + "/Reply." + replyId++;
                                        configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId());
-                                       configuration.getStringValue(replyPrefix + "/Sone/ID").setValue(reply.getSone().getId());
-                                       configuration.getStringValue(replyPrefix + "/Sone/Key").setValue(reply.getSone().getRequestUri().toString());
-                                       configuration.getStringValue(replyPrefix + "/Sone/Name").setValue(reply.getSone().getName());
                                        configuration.getStringValue(replyPrefix + "/Post").setValue(reply.getPost().getId());
                                        configuration.getLongValue(replyPrefix + "/Time").setValue(reply.getTime());
                                        configuration.getStringValue(replyPrefix + "/Text").setValue(reply.getText());