Store request URI in yet unknown Sones when parsing.

[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 8570e9a..b838216 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;
@@ -135,13 +136,21 @@ 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);
        }
 
        /**
+        * Returns all known sones.
+        *
+        * @return All known sones
+        */
+       public Collection<Sone> getKnownSones() {
+               return soneCache.values();
+       }
+
+       /**
         * Creates a new post.
         *
         * @param sone
@@ -210,6 +219,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
@@ -219,7 +240,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);
                }
        }
@@ -290,7 +310,9 @@ public class Core extends AbstractService {
         */
        public void loadSone(String requestUri) {
                try {
-                       FetchResult fetchResult = freenetInterface.fetchUri(new FreenetURI(requestUri).setMetaString(new String[] { "sone.xml" }));
+                       FreenetURI realRequestUri = new FreenetURI(requestUri).setMetaString(new String[] { "sone.xml" });
+                       FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri);
+                       soneDownloader.parseSone(null, fetchResult, realRequestUri);
                } catch (MalformedURLException mue1) {
                        logger.log(Level.INFO, "Could not create URI from “" + requestUri + "”.", mue1);
                }