X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=7ddc2470e934e3936db1669a50a38d887d2bce14;hb=fcd011a16b119966906b3137513e9432ab86c3a8;hp=7333d6848637b719df35b07e8cbfe6d95a92b220;hpb=ce4b3424f5503697ee937efb71fb2e3bc86659bc;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 7333d68..7ddc247 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -22,9 +22,11 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.core.SoneException.Type;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
@@ -93,14 +95,79 @@ public class Core extends AbstractService {
 	 *
 	 * @return The local Sones
 	 */
-	public Set<Sone> localSones() {
-		return localSones;
+	public Set<Sone> getSones() {
+		return Collections.unmodifiableSet(localSones);
 	}
 
 	//
 	// ACTIONS
 	//
 
+	/**
+	 * Creates a new Sone at a random location.
+	 *
+	 * @param name
+	 *            The name of the Sone
+	 * @return The created Sone
+	 * @throws SoneException
+	 *             if a Sone error occurs
+	 */
+	public Sone createSone(String name) throws SoneException {
+		return createSone(name, null, null);
+	}
+
+	/**
+	 * Creates a new Sone at the given location. If one of {@code requestUri} or
+	 * {@code insertUrI} is {@code null}, the Sone is created at a random
+	 * location.
+	 *
+	 * @param name
+	 *            The name of the Sone
+	 * @param requestUri
+	 *            The request URI of the Sone, or {@link NullPointerException}
+	 *            to create a Sone at a random location
+	 * @param insertUri
+	 *            The insert URI of the Sone, or {@code null} to create a Sone
+	 *            at a random location
+	 * @return The created Sone
+	 * @throws SoneException
+	 *             if a Sone error occurs
+	 */
+	public Sone createSone(String name, String requestUri, String insertUri) throws SoneException {
+		if ((name == null) || (name.trim().length() == 0)) {
+			throw new SoneException(Type.INVALID_SONE_NAME);
+		}
+		String finalRequestUri;
+		String finalInsertUri;
+		if ((requestUri == null) || (insertUri == null)) {
+			String[] keyPair = freenetInterface.generateKeyPair();
+			finalRequestUri = keyPair[0];
+			finalInsertUri = keyPair[1];
+		} else {
+			finalRequestUri = requestUri;
+			finalInsertUri = insertUri;
+		}
+		Sone sone;
+		try {
+			logger.log(Level.FINEST, "Creating new Sone “%s” at %s (%s)…", new Object[] { name, finalRequestUri, finalInsertUri });
+			sone = new Sone(UUID.randomUUID(), name, new FreenetURI(finalRequestUri), new FreenetURI(finalInsertUri));
+		} catch (MalformedURLException mue1) {
+			throw new SoneException(Type.INVALID_URI);
+		}
+		localSones.add(sone);
+		return sone;
+	}
+
+	/**
+	 * Deletes the given Sone from this plugin instance.
+	 *
+	 * @param sone
+	 *            The sone to delete
+	 */
+	public void deleteSone(Sone sone) {
+		localSones.remove(sone);
+	}
+
 	//
 	// SERVICE METHODS
 	//
@@ -147,10 +214,11 @@ public class Core extends AbstractService {
 		/* parse local Sones. */
 		logger.log(Level.INFO, "Loading %d Sones…", allSoneNames.size());
 		for (String soneName : allSoneNames) {
+			String id = configuration.getStringValue("Sone/Name." + soneName + "/ID").getValue(null);
 			String insertUri = configuration.getStringValue("Sone/Name." + soneName + "/InsertURI").getValue(null);
 			String requestUri = configuration.getStringValue("Sone/Name." + soneName + "/RequestURI").getValue(null);
 			try {
-				localSones.add(new Sone(soneName, new FreenetURI(requestUri), new FreenetURI(insertUri)));
+				localSones.add(new Sone(UUID.fromString(id), soneName, new FreenetURI(requestUri), new FreenetURI(insertUri)));
 			} catch (MalformedURLException mue1) {
 				logger.log(Level.WARNING, "Could not create Sone from requestUri (“" + requestUri + "”) and insertUri (“" + insertUri + "”)!", mue1);
 			}
@@ -178,6 +246,7 @@ public class Core extends AbstractService {
 
 			/* store all Sones. */
 			for (Sone sone : localSones) {
+				configuration.getStringValue("Sone/Name." + sone.getName() + "/ID").setValue(sone.getId());
 				configuration.getStringValue("Sone/Name." + sone.getName() + "/RequestURI").setValue(sone.getRequestUri().toString());
 				configuration.getStringValue("Sone/Name." + sone.getName() + "/InsertURI").setValue(sone.getInsertUri().toString());
 			}