X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=13f158981cfea5a7da63cb34fc78d7f663c1c704;hb=00adeb7e4a42365d0b5feb4e38338285e91a2301;hp=84e813e19fdf09ab4d6bb1f67eb8ab05009e4e41;hpb=eed67a96e4545a032a4cb82ecc8901d041c42deb;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 84e813e..13f1589 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -22,11 +22,13 @@ 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.data.Sone;
 import net.pterodactylus.util.config.Configuration;
+import net.pterodactylus.util.config.ConfigurationException;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.text.StringEscaper;
@@ -46,6 +48,9 @@ public class Core extends AbstractService {
 	/** The configuration. */
 	private Configuration configuration;
 
+	/** Interface to freenet. */
+	private FreenetInterface freenetInterface;
+
 	/** The local Sones. */
 	private final Set<Sone> localSones = new HashSet<Sone>();
 
@@ -72,6 +77,27 @@ public class Core extends AbstractService {
 		return this;
 	}
 
+	/**
+	 * Sets the Freenet interface to use.
+	 *
+	 * @param freenetInterface
+	 *            The Freenet interface to use
+	 * @return This core (for method chaining)
+	 */
+	public Core freenetInterface(FreenetInterface freenetInterface) {
+		this.freenetInterface = freenetInterface;
+		return this;
+	}
+
+	/**
+	 * Returns the local Sones.
+	 *
+	 * @return The local Sones
+	 */
+	public Set<Sone> localSones() {
+		return localSones;
+	}
+
 	//
 	// ACTIONS
 	//
@@ -88,6 +114,14 @@ public class Core extends AbstractService {
 		loadConfiguration();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void serviceStop() {
+		saveConfiguration();
+	}
+
 	//
 	// PRIVATE METHODS
 	//
@@ -99,7 +133,10 @@ public class Core extends AbstractService {
 		logger.entering(Core.class.getName(), "loadConfiguration()");
 
 		/* get names of all local Sones. */
-		String allSoneNamesString = configuration.getStringValue("Sone/Names").getValue("");
+		String allSoneNamesString = configuration.getStringValue("Sone/Names").getValue(null);
+		if (allSoneNamesString == null) {
+			allSoneNamesString = "";
+		}
 		List<String> allSoneNames;
 		try {
 			allSoneNames = StringEscaper.parseLine(allSoneNamesString);
@@ -109,11 +146,13 @@ 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(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);
 			}
@@ -122,4 +161,32 @@ public class Core extends AbstractService {
 		logger.exiting(Core.class.getName(), "loadConfiguration()");
 	}
 
+	/**
+	 * Saves the configuraiton.
+	 */
+	private void saveConfiguration() {
+
+		/* get the names of all Sones. */
+		Set<String> soneNames = new HashSet<String>();
+		for (Sone sone : localSones) {
+			soneNames.add(sone.getName());
+		}
+		String soneNamesString = StringEscaper.escapeWords(soneNames);
+
+		logger.log(Level.INFO, "Storing %d Sones…", soneNames.size());
+		try {
+			/* store names of all Sones. */
+			configuration.getStringValue("Sone/Names").setValue(soneNamesString);
+
+			/* 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());
+			}
+		} catch (ConfigurationException ce1) {
+			logger.log(Level.WARNING, "Could not store configuration!", ce1);
+		}
+	}
+
 }