X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=2894945ee656d8e3bc5f49563551924d20fcf95b;hb=a6601fb1de49f42c26eccb9dff5c07a17feceafc;hp=90d3696fd7f47aa1efd34fca130bd820a6d2d791;hpb=ba4d63c0da5bc1326073ccab87bff409291be571;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 90d3696..2894945 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -31,6 +31,7 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.core.Options.DefaultOption;
 import net.pterodactylus.sone.core.Options.Option;
 import net.pterodactylus.sone.core.Options.OptionWatcher;
+import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Reply;
@@ -39,6 +40,7 @@ import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.freenet.wot.IdentityListener;
 import net.pterodactylus.sone.freenet.wot.IdentityManager;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
+import net.pterodactylus.sone.main.SonePlugin;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
 import net.pterodactylus.util.logging.Logging;
@@ -78,6 +80,9 @@ public class Core implements IdentityListener {
 	/** The options. */
 	private final Options options = new Options();
 
+	/** The core listener manager. */
+	private final CoreListenerManager coreListenerManager = new CoreListenerManager(this);
+
 	/** The configuration. */
 	private final Configuration configuration;
 
@@ -150,6 +155,30 @@ public class Core implements IdentityListener {
 	}
 
 	//
+	// LISTENER MANAGEMENT
+	//
+
+	/**
+	 * Adds a new core listener.
+	 *
+	 * @param coreListener
+	 *            The listener to add
+	 */
+	public void addCoreListener(CoreListener coreListener) {
+		coreListenerManager.addListener(coreListener);
+	}
+
+	/**
+	 * Removes a core listener.
+	 *
+	 * @param coreListener
+	 *            The listener to remove
+	 */
+	public void removeCoreListener(CoreListener coreListener) {
+		coreListenerManager.removeListener(coreListener);
+	}
+
+	//
 	// ACCESSORS
 	//
 
@@ -301,9 +330,23 @@ public class Core implements IdentityListener {
 	 * @return The Sone with the given ID
 	 */
 	public Sone getLocalSone(String id) {
+		return getLocalSone(id, true);
+	}
+
+	/**
+	 * Returns the local Sone with the given ID, optionally creating a new Sone.
+	 *
+	 * @param id
+	 *            The ID of the Sone
+	 * @param create
+	 *            {@code true} to create a new Sone if none exists,
+	 *            {@code false} to return null if none exists
+	 * @return The Sone with the given ID, or {@code null}
+	 */
+	public Sone getLocalSone(String id, boolean create) {
 		synchronized (localSones) {
 			Sone sone = localSones.get(id);
-			if (sone == null) {
+			if ((sone == null) && create) {
 				sone = new Sone(id);
 				localSones.put(id, sone);
 			}
@@ -578,11 +621,12 @@ public class Core implements IdentityListener {
 			final Sone sone;
 			try {
 				sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
-				sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
 			} catch (MalformedURLException mue1) {
 				logger.log(Level.SEVERE, "Could not convert the Identity’s URIs to Freenet URIs: " + ownIdentity.getInsertUri() + ", " + ownIdentity.getRequestUri(), mue1);
 				return null;
 			}
+			sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
+			sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
 			/* TODO - load posts ’n stuff */
 			localSones.put(ownIdentity.getId(), sone);
 			SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
@@ -635,7 +679,13 @@ public class Core implements IdentityListener {
 			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
 			if (newSone) {
 				synchronized (newSones) {
-					newSones.add(sone.getId());
+					newSone = !knownSones.contains(sone.getId());
+					if (newSone) {
+						newSones.add(sone.getId());
+					}
+				}
+				if (newSone) {
+					coreListenerManager.fireNewSoneFound(sone);
 				}
 			}
 			remoteSones.put(identity.getId(), sone);
@@ -695,6 +745,7 @@ public class Core implements IdentityListener {
 			}
 			synchronized (storedSone) {
 				storedSone.setTime(sone.getTime());
+				storedSone.setClient(sone.getClient());
 				storedSone.setProfile(sone.getProfile());
 				storedSone.setPosts(sone.getPosts());
 				storedSone.setReplies(sone.getReplies());