X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=76881ef78a6cf408c93236784b790979f3371dce;hb=0f1d38f9011a73939437b6158b8c8bdd1a3dc5eb;hp=41970679e2fdbec92dc5ffebaececcf50a3f90ba;hpb=d4c8c5492c2e3743a83d6f49993bcf5289353e0c;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 4197067..76881ef 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -52,6 +52,23 @@ 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 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 +87,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 +159,7 @@ public class Core extends AbstractService {
 		if (!soneCache.containsKey(soneId)) {
 			Sone sone = new Sone(soneId);
 			soneCache.put(soneId, sone);
+			setSoneStatus(sone, SoneStatus.idle);
 		}
 		return soneCache.get(soneId);
 	}
@@ -169,6 +190,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
@@ -274,7 +318,7 @@ public class Core extends AbstractService {
 	 *             if a Sone error occurs
 	 */
 	public Sone createSone(String name) throws SoneException {
-		return createSone(name, null, null);
+		return createSone(name, "Sone-" + name, null, null);
 	}
 
 	/**
@@ -284,6 +328,8 @@ public class Core extends AbstractService {
 	 *
 	 * @param name
 	 *            The name of the Sone
+	 * @param documentName
+	 *            The document name in the SSK
 	 * @param requestUri
 	 *            The request URI of the Sone, or {@link NullPointerException}
 	 *            to create a Sone at a random location
@@ -294,7 +340,7 @@ public class Core extends AbstractService {
 	 * @throws SoneException
 	 *             if a Sone error occurs
 	 */
-	public Sone createSone(String name, String requestUri, String insertUri) throws SoneException {
+	public Sone createSone(String name, String documentName, String requestUri, String insertUri) throws SoneException {
 		if ((name == null) || (name.trim().length() == 0)) {
 			throw new SoneException(Type.INVALID_SONE_NAME);
 		}
@@ -311,7 +357,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 = 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 = getSone(UUID.randomUUID().toString()).setName(name).setRequestUri(new FreenetURI(finalRequestUri).setKeyType("USK").setDocName(documentName)).setInsertUri(new FreenetURI(finalInsertUri).setKeyType("USK").setDocName(documentName));
 			sone.setProfile(new Profile());
 			/* set modification counter to 1 so it is inserted immediately. */
 			sone.setModificationCounter(1);
@@ -353,6 +399,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) {
@@ -382,10 +431,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, SoneStatus.idle);
 				}
 			}
 		}, "Sone Downloader").start();