X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=6ecd5fccf61ee9a07a700d1b7665c74b14e938e5;hb=08f0784ec6247da055b3d07835aa089333de0bcb;hp=eb517fc26eb9334fd1091ce1baaf37c1f4da110c;hpb=314be56fa3e4ac53dac18ae0282439559209f4b3;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index eb517fc..6ecd5fc 100644
--- 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;
@@ -141,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
@@ -154,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
@@ -216,7 +244,10 @@ public class Core extends AbstractService {
 	 *            The Sone to watch for updates
 	 */
 	public void addSone(Sone sone) {
-		soneDownloader.addSone(sone);
+		soneCache.put(sone.getId(), sone);
+		if (!localSones.contains(sone)) {
+			soneDownloader.addSone(sone);
+		}
 	}
 
 	/**
@@ -292,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();
 	}
 
 	/**
@@ -471,7 +536,6 @@ 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);
 					sone.addFriend(friendSone);
 				}
 
@@ -483,6 +547,11 @@ public class Core extends AbstractService {
 		} while (true);
 		logger.log(Level.INFO, "Loaded %d Sones.", getSones().size());
 
+		/* load all remote Sones. */
+		for (Sone remoteSone : getRemoteSones()) {
+			loadSone(remoteSone);
+		}
+
 		logger.exiting(Core.class.getName(), "loadConfiguration()");
 	}