X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=0f733b6e458a2f240e01df782990344675941639;hb=181af5c8af499a60095f46748d6f0a40c40f88db;hp=a6cbc8266c5eeb66492f7a0fffd3026aef98e928;hpb=f17746700b861bb3485b839397a6fc073ab0bd93;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 a6cbc82..0f733b6 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -52,6 +52,26 @@ import freenet.keys.FreenetURI;
  */
 public class Core extends AbstractService {
 
+	/**
+	 * Enumeration for the possible states of a {@link Sone}.
+	 *
+	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+	 */
+	public enum SoneStatus {
+
+		/** The Sone is unknown, i.e. not yet downloaded. */
+		unknown,
+
+		/** The Sone is idle, i.e. not being downloaded or inserted. */
+		idle,
+
+		/** The Sone is currently being inserted. */
+		inserting,
+
+		/** The Sone is currently being downloaded. */
+		downloading,
+	}
+
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(Core.class);
 
@@ -70,6 +90,9 @@ public class Core extends AbstractService {
 	/** Sone inserters. */
 	private final Map<Sone, SoneInserter> soneInserters = new HashMap<Sone, SoneInserter>();
 
+	/** The Sones’ statuses. */
+	private final Map<Sone, SoneStatus> soneStatuses = new HashMap<Sone, SoneStatus>();
+
 	/* various caches follow here. */
 
 	/** Cache for all known Sones. */
@@ -139,6 +162,7 @@ public class Core extends AbstractService {
 		if (!soneCache.containsKey(soneId)) {
 			Sone sone = new Sone(soneId);
 			soneCache.put(soneId, sone);
+			setSoneStatus(sone, SoneStatus.unknown);
 		}
 		return soneCache.get(soneId);
 	}
@@ -169,6 +193,29 @@ public class Core extends AbstractService {
 	}
 
 	/**
+	 * Returns the status of the given Sone.
+	 *
+	 * @param sone
+	 *            The Sone to get the status for
+	 * @return The status of the Sone
+	 */
+	public SoneStatus getSoneStatus(Sone sone) {
+		return soneStatuses.get(sone);
+	}
+
+	/**
+	 * Sets the status of the Sone.
+	 *
+	 * @param sone
+	 *            The Sone to set the status for
+	 * @param soneStatus
+	 *            The status of the Sone
+	 */
+	public void setSoneStatus(Sone sone, SoneStatus soneStatus) {
+		soneStatuses.put(sone, soneStatus);
+	}
+
+	/**
 	 * Creates a new post and adds it to the given Sone.
 	 *
 	 * @param sone
@@ -258,6 +305,7 @@ public class Core extends AbstractService {
 	 */
 	public void addLocalSone(Sone sone) {
 		if (localSones.add(sone)) {
+			setSoneStatus(sone, SoneStatus.idle);
 			SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
 			soneInserter.start();
 			soneInserters.put(sone, soneInserter);
@@ -355,6 +403,9 @@ public class Core extends AbstractService {
 				try {
 					FreenetURI realRequestUri = new FreenetURI(requestUri).setMetaString(new String[] { "sone.xml" });
 					FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri);
+					if (fetchResult == null) {
+						return;
+					}
 					Sone parsedSone = soneDownloader.parseSone(null, fetchResult, realRequestUri);
 					if (parsedSone != null) {
 						if (insertUri != null) {
@@ -384,10 +435,19 @@ public class Core extends AbstractService {
 			@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);
+				setSoneStatus(sone, SoneStatus.downloading);
+				try {
+					FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri);
+					if (fetchResult == null) {
+						/* TODO - mark Sone as bad. */
+						return;
+					}
+					Sone parsedSone = soneDownloader.parseSone(sone, fetchResult, realRequestUri);
+					if (parsedSone != null) {
+						addSone(parsedSone);
+					}
+				} finally {
+					setSoneStatus(sone, (sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
 				}
 			}
 		}, "Sone Downloader").start();