X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=a4b3569846e9438f1b762a63d2a5f6790a5ad8b6;hb=c8f518f638aa16cf37145561b709d28252de213a;hp=ddca79f78d40b3b8e889e3145d4bcaaf71e4456e;hpb=c87911369ba505171e19dfa2f88129a209ee389b;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 ddca79f..a4b3569 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -18,22 +18,31 @@
 package net.pterodactylus.sone.core;
 
 import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 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.Post;
+import net.pterodactylus.sone.data.Profile;
+import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
+import net.pterodactylus.util.filter.Filter;
+import net.pterodactylus.util.filter.Filters;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
-import net.pterodactylus.util.text.StringEscaper;
-import net.pterodactylus.util.text.TextException;
+import freenet.client.FetchResult;
 import freenet.keys.FreenetURI;
 
 /**
@@ -43,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);
 
@@ -52,14 +81,34 @@ public class Core extends AbstractService {
 	/** Interface to freenet. */
 	private FreenetInterface freenetInterface;
 
+	/** The Sone downloader. */
+	private SoneDownloader soneDownloader;
+
 	/** The local Sones. */
 	private final Set<Sone> localSones = new HashSet<Sone>();
 
+	/** Sone inserters. */
+	private final Map<Sone, SoneInserter> soneInserters = new HashMap<Sone, SoneInserter>();
+
+	/** The Sones’ statuses. */
+	private final Map<Sone, SoneStatus> soneStatuses = Collections.synchronizedMap(new HashMap<Sone, SoneStatus>());
+
+	/* various caches follow here. */
+
+	/** Cache for all known Sones. */
+	private final Map<String, Sone> soneCache = new HashMap<String, Sone>();
+
+	/** Cache for all known posts. */
+	private final Map<String, Post> postCache = new HashMap<String, Post>();
+
+	/** Cache for all known replies. */
+	private final Map<String, Reply> replyCache = new HashMap<String, Reply>();
+
 	/**
 	 * Creates a new core.
 	 */
 	public Core() {
-		super("Sone Core");
+		super("Sone Core", false);
 	}
 
 	//
@@ -87,6 +136,8 @@ public class Core extends AbstractService {
 	 */
 	public Core freenetInterface(FreenetInterface freenetInterface) {
 		this.freenetInterface = freenetInterface;
+		soneDownloader = new SoneDownloader(this, freenetInterface);
+		soneDownloader.start();
 		return this;
 	}
 
@@ -95,8 +146,137 @@ public class Core extends AbstractService {
 	 *
 	 * @return The local Sones
 	 */
-	public Set<Sone> localSones() {
-		return localSones;
+	public Set<Sone> getSones() {
+		return Collections.unmodifiableSet(localSones);
+	}
+
+	/**
+	 * Returns the Sone with the given ID, or an empty Sone that has been
+	 * initialized with the given ID.
+	 *
+	 * @param soneId
+	 *            The ID of the Sone
+	 * @return The Sone
+	 */
+	public Sone getSone(String soneId) {
+		if (!soneCache.containsKey(soneId)) {
+			Sone sone = new Sone(soneId);
+			soneCache.put(soneId, sone);
+			setSoneStatus(sone, SoneStatus.unknown);
+		}
+		return soneCache.get(soneId);
+	}
+
+	/**
+	 * Returns all known sones.
+	 *
+	 * @return All known sones
+	 */
+	public Collection<Sone> getKnownSones() {
+		return soneCache.values();
+	}
+
+	/**
+	 * Gets all known Sones that are not local Sones.
+	 *
+	 * @return All remote Sones
+	 */
+	public Collection<Sone> getRemoteSones() {
+		return Filters.filteredCollection(getKnownSones(), new Filter<Sone>() {
+
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public boolean filterObject(Sone object) {
+				return !localSones.contains(object);
+			}
+		});
+	}
+
+	/**
+	 * 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
+	 *            The sone that creates the post
+	 * @param text
+	 *            The text of the post
+	 * @return The created post
+	 */
+	public Post createPost(Sone sone, String text) {
+		return createPost(sone, System.currentTimeMillis(), text);
+	}
+
+	/**
+	 * Creates a new post and adds it to the given Sone.
+	 *
+	 * @param sone
+	 *            The Sone that creates the post
+	 * @param time
+	 *            The time of the post
+	 * @param text
+	 *            The text of the post
+	 * @return The created post
+	 */
+	public Post createPost(Sone sone, long time, String text) {
+		Post post = getPost(UUID.randomUUID().toString()).setSone(sone).setTime(time).setText(text);
+		sone.addPost(post);
+		return post;
+	}
+
+	/**
+	 * Creates a reply.
+	 *
+	 * @param sone
+	 *            The Sone that posts the reply
+	 * @param post
+	 *            The post the reply refers to
+	 * @param text
+	 *            The text of the reply
+	 * @return The created reply
+	 */
+	public Reply createReply(Sone sone, Post post, String text) {
+		return createReply(sone, post, System.currentTimeMillis(), text);
+	}
+
+	/**
+	 * Creates a reply.
+	 *
+	 * @param sone
+	 *            The Sone that posts the reply
+	 * @param post
+	 *            The post the reply refers to
+	 * @param time
+	 *            The time of the post
+	 * @param text
+	 *            The text of the reply
+	 * @return The created reply
+	 */
+	public Reply createReply(Sone sone, Post post, long time, String text) {
+		Reply reply = getReply(UUID.randomUUID().toString()).setSone(sone).setPost(post).setTime(time).setText(text);
+		sone.addReply(reply);
+		return reply;
 	}
 
 	//
@@ -104,6 +284,35 @@ public class Core extends AbstractService {
 	//
 
 	/**
+	 * Adds a Sone to watch for updates. The Sone needs to be completely
+	 * initialized.
+	 *
+	 * @param sone
+	 *            The Sone to watch for updates
+	 */
+	public void addSone(Sone sone) {
+		soneCache.put(sone.getId(), sone);
+		if (!localSones.contains(sone)) {
+			soneDownloader.addSone(sone);
+		}
+	}
+
+	/**
+	 * Adds the given Sone.
+	 *
+	 * @param sone
+	 *            The Sone to add
+	 */
+	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);
+		}
+	}
+
+	/**
 	 * Creates a new Sone at a random location.
 	 *
 	 * @param name
@@ -113,7 +322,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);
 	}
 
 	/**
@@ -123,6 +332,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
@@ -133,7 +344,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);
 		}
@@ -150,24 +361,196 @@ 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 = new Sone(UUID.randomUUID(), name, new FreenetURI(finalRequestUri), new FreenetURI(finalInsertUri));
+			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);
+			addLocalSone(sone);
 		} catch (MalformedURLException mue1) {
 			throw new SoneException(Type.INVALID_URI);
 		}
-		localSones.add(sone);
 		return sone;
 	}
 
 	/**
+	 * Loads the Sone from the given request URI. The fetching of the data is
+	 * performed in a new thread so this method returns immediately.
+	 *
+	 * @param requestUri
+	 *            The request URI to load the Sone from
+	 */
+	public void loadSone(final String requestUri) {
+		loadSone(requestUri, null);
+	}
+
+	/**
+	 * Loads the Sone from the given request URI. The fetching of the data is
+	 * performed in a new thread so this method returns immediately. If
+	 * {@code insertUri} is not {@code null} the loaded Sone is converted into a
+	 * local Sone and available using as any other local Sone.
+	 *
+	 * @param requestUri
+	 *            The request URI to load the Sone from
+	 * @param insertUri
+	 *            The insert URI of the Sone
+	 */
+	public void loadSone(final String requestUri, final String insertUri) {
+		new Thread(new Runnable() {
+
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() {
+				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) {
+							parsedSone.setInsertUri(new FreenetURI(insertUri));
+							addLocalSone(parsedSone);
+						} else {
+							addSone(parsedSone);
+						}
+					}
+				} catch (MalformedURLException mue1) {
+					logger.log(Level.INFO, "Could not create URI from “" + requestUri + "”.", mue1);
+				}
+			}
+		}, "Sone Downloader").start();
+	}
+
+	/**
+	 * Loads and updates the given Sone.
+	 *
+	 * @param sone
+	 *            The Sone to load
+	 */
+	public void loadSone(final Sone sone) {
+		new Thread(new Runnable() {
+
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() {
+				FreenetURI realRequestUri = sone.getRequestUri().setMetaString(new String[] { "sone.xml" });
+				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();
+	}
+
+	/**
 	 * Deletes the given Sone from this plugin instance.
 	 *
 	 * @param sone
 	 *            The sone to delete
 	 */
 	public void deleteSone(Sone sone) {
+		SoneInserter soneInserter = soneInserters.remove(sone);
+		soneInserter.stop();
 		localSones.remove(sone);
 	}
 
+	/**
+	 * Returns the post with the given ID. If no post exists yet with the given
+	 * ID, a new post is returned.
+	 *
+	 * @param postId
+	 *            The ID of the post
+	 * @return The post
+	 */
+	public Post getPost(String postId) {
+		if (!postCache.containsKey(postId)) {
+			postCache.put(postId, new Post(postId));
+		}
+		return postCache.get(postId);
+	}
+
+	/**
+	 * Returns the reply with the given ID. If no reply exists yet with the
+	 * given ID, a new reply is returned.
+	 *
+	 * @param replyId
+	 *            The ID of the reply
+	 * @return The reply
+	 */
+	public Reply getReply(String replyId) {
+		if (!replyCache.containsKey(replyId)) {
+			replyCache.put(replyId, new Reply(replyId));
+		}
+		return replyCache.get(replyId);
+	}
+
+	/**
+	 * Gets all replies to the given post, sorted by date, oldest first.
+	 *
+	 * @param post
+	 *            The post the replies refer to
+	 * @return The sorted list of replies for the post
+	 */
+	public List<Reply> getReplies(Post post) {
+		List<Reply> replies = new ArrayList<Reply>();
+		for (Reply reply : replyCache.values()) {
+			if (reply.getPost().equals(post)) {
+				replies.add(reply);
+			}
+		}
+		Collections.sort(replies, new Comparator<Reply>() {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public int compare(Reply leftReply, Reply rightReply) {
+				return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, leftReply.getTime() - rightReply.getTime()));
+			}
+		});
+		return replies;
+	}
+
+	/**
+	 * Gets all Sones that like the given post.
+	 *
+	 * @param post
+	 *            The post to check for
+	 * @return All Sones that like the post
+	 */
+	public Set<Sone> getLikes(final Post post) {
+		return Filters.filteredSet(getSones(), new Filter<Sone>() {
+
+			@Override
+			public boolean filterObject(Sone sone) {
+				return sone.isLikedPostId(post.getId());
+			}
+		});
+	}
+
+	/**
+	 * Deletes the given reply. It is removed from its Sone and from the reply
+	 * cache.
+	 *
+	 * @param reply
+	 *            The reply to remove
+	 */
+	public void deleteReply(Reply reply) {
+		reply.getSone().removeReply(reply);
+		replyCache.remove(reply.getId());
+	}
+
 	//
 	// SERVICE METHODS
 	//
@@ -185,6 +568,11 @@ public class Core extends AbstractService {
 	 */
 	@Override
 	protected void serviceStop() {
+		soneDownloader.stop();
+		/* stop all Sone inserters. */
+		for (SoneInserter soneInserter : soneInserters.values()) {
+			soneInserter.stop();
+		}
 		saveConfiguration();
 	}
 
@@ -198,30 +586,121 @@ public class Core extends AbstractService {
 	private void loadConfiguration() {
 		logger.entering(Core.class.getName(), "loadConfiguration()");
 
-		/* get names of all local Sones. */
-		String allSoneNamesString = configuration.getStringValue("Sone/Names").getValue(null);
-		if (allSoneNamesString == null) {
-			allSoneNamesString = "";
-		}
-		List<String> allSoneNames;
-		try {
-			allSoneNames = StringEscaper.parseLine(allSoneNamesString);
-		} catch (TextException te1) {
-			logger.log(Level.WARNING, "Could not parse Sone names: “" + allSoneNamesString + "”", te1);
-			allSoneNames = Collections.emptyList();
-		}
-
 		/* 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);
+		logger.log(Level.INFO, "Loading Sones…");
+		int soneId = 0;
+		do {
+			String sonePrefix = "Sone/Sone." + soneId++;
+			String id = configuration.getStringValue(sonePrefix + "/ID").getValue(null);
+			if (id == null) {
+				break;
+			}
+			String name = configuration.getStringValue(sonePrefix + "/Name").getValue(null);
+			long time = configuration.getLongValue(sonePrefix + "/Time").getValue((long) 0);
+			String insertUri = configuration.getStringValue(sonePrefix + "/InsertURI").getValue(null);
+			String requestUri = configuration.getStringValue(sonePrefix + "/RequestURI").getValue(null);
+			long modificationCounter = configuration.getLongValue(sonePrefix + "/ModificationCounter").getValue((long) 0);
+			String firstName = configuration.getStringValue(sonePrefix + "/Profile/FirstName").getValue(null);
+			String middleName = configuration.getStringValue(sonePrefix + "/Profile/MiddleName").getValue(null);
+			String lastName = configuration.getStringValue(sonePrefix + "/Profile/LastName").getValue(null);
 			try {
-				localSones.add(new Sone(UUID.fromString(id), soneName, new FreenetURI(requestUri), new FreenetURI(insertUri)));
+				Profile profile = new Profile();
+				profile.setFirstName(firstName);
+				profile.setMiddleName(middleName);
+				profile.setLastName(lastName);
+				Sone sone = getSone(id).setName(name).setTime(time).setRequestUri(new FreenetURI(requestUri)).setInsertUri(new FreenetURI(insertUri));
+				sone.setProfile(profile);
+				int postId = 0;
+				do {
+					String postPrefix = sonePrefix + "/Post." + postId++;
+					id = configuration.getStringValue(postPrefix + "/ID").getValue(null);
+					if (id == null) {
+						break;
+					}
+					time = configuration.getLongValue(postPrefix + "/Time").getValue((long) 0);
+					String text = configuration.getStringValue(postPrefix + "/Text").getValue(null);
+					Post post = getPost(id).setSone(sone).setTime(time).setText(text);
+					sone.addPost(post);
+				} while (true);
+				int replyCounter = 0;
+				do {
+					String replyPrefix = sonePrefix + "/Reply." + replyCounter++;
+					String replyId = configuration.getStringValue(replyPrefix + "/ID").getValue(null);
+					if (replyId == null) {
+						break;
+					}
+					Post replyPost = getPost(configuration.getStringValue(replyPrefix + "/Post").getValue(null));
+					long replyTime = configuration.getLongValue(replyPrefix + "/Time").getValue(null);
+					String replyText = configuration.getStringValue(replyPrefix + "/Text").getValue(null);
+					Reply reply = getReply(replyId).setSone(sone).setPost(replyPost).setTime(replyTime).setText(replyText);
+					sone.addReply(reply);
+				} while (true);
+
+				/* load friends. */
+				int friendCounter = 0;
+				while (true) {
+					String friendPrefix = sonePrefix + "/Friend." + friendCounter++;
+					String friendId = configuration.getStringValue(friendPrefix + "/ID").getValue(null);
+					if (friendId == null) {
+						break;
+					}
+					Sone friendSone = getSone(friendId);
+					String friendKey = configuration.getStringValue(friendPrefix + "/Key").getValue(null);
+					String friendName = configuration.getStringValue(friendPrefix + "/Name").getValue(null);
+					friendSone.setRequestUri(new FreenetURI(friendKey)).setName(friendName);
+					sone.addFriend(friendSone);
+				}
+
+				/* load blocked Sone IDs. */
+				int blockedSoneCounter = 0;
+				while (true) {
+					String blockedSonePrefix = sonePrefix + "/BlockedSone." + blockedSoneCounter++;
+					String blockedSoneId = configuration.getStringValue(blockedSonePrefix + "/ID").getValue(null);
+					if (blockedSoneId == null) {
+						break;
+					}
+					sone.addBlockedSoneId(blockedSoneId);
+				}
+
+				/* load liked post IDs. */
+				int likedPostIdCounter = 0;
+				while (true) {
+					String likedPostIdPrefix = sonePrefix + "/LikedPostId." + likedPostIdCounter++;
+					String likedPostId = configuration.getStringValue(likedPostIdPrefix + "/ID").getValue(null);
+					if (likedPostId == null) {
+						break;
+					}
+					sone.addLikedPostId(likedPostId);
+				}
+
+				sone.setModificationCounter(modificationCounter);
+				addLocalSone(sone);
 			} catch (MalformedURLException mue1) {
 				logger.log(Level.WARNING, "Could not create Sone from requestUri (“" + requestUri + "”) and insertUri (“" + insertUri + "”)!", mue1);
 			}
+		} while (true);
+		logger.log(Level.INFO, "Loaded %d Sones.", getSones().size());
+
+		/* load all known Sones. */
+		int knownSonesCounter = 0;
+		while (true) {
+			String knownSonePrefix = "KnownSone." + knownSonesCounter++;
+			String knownSoneId = configuration.getStringValue(knownSonePrefix + "/ID").getValue(null);
+			if (knownSoneId == null) {
+				break;
+			}
+			String knownSoneName = configuration.getStringValue(knownSonePrefix + "/Name").getValue(null);
+			String knownSoneKey = configuration.getStringValue(knownSonePrefix + "/Key").getValue(null);
+			try {
+				getSone(knownSoneId).setName(knownSoneName).setRequestUri(new FreenetURI(knownSoneKey));
+			} catch (MalformedURLException mue1) {
+				logger.log(Level.WARNING, "Could not create Sone from requestUri (“" + knownSoneKey + "”)!", mue1);
+			}
+		}
+
+		/* load all remote Sones. */
+		for (Sone remoteSone : getRemoteSones()) {
+			loadSone(remoteSone);
 		}
 
 		logger.exiting(Core.class.getName(), "loadConfiguration()");
@@ -231,25 +710,85 @@ public class Core extends AbstractService {
 	 * 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());
+		Set<Sone> sones = getSones();
+		logger.log(Level.INFO, "Storing %d Sones…", sones.size());
 		try {
-			/* store names of all Sones. */
-			configuration.getStringValue("Sone/Names").setValue(soneNamesString);
-
 			/* store all Sones. */
+			int soneId = 0;
 			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());
+				String sonePrefix = "Sone/Sone." + soneId++;
+				configuration.getStringValue(sonePrefix + "/ID").setValue(sone.getId());
+				configuration.getStringValue(sonePrefix + "/Name").setValue(sone.getName());
+				configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime());
+				configuration.getStringValue(sonePrefix + "/RequestURI").setValue(sone.getRequestUri().toString());
+				configuration.getStringValue(sonePrefix + "/InsertURI").setValue(sone.getInsertUri().toString());
+				configuration.getLongValue(sonePrefix + "/ModificationCounter").setValue(sone.getModificationCounter());
+				Profile profile = sone.getProfile();
+				configuration.getStringValue(sonePrefix + "/Profile/FirstName").setValue(profile.getFirstName());
+				configuration.getStringValue(sonePrefix + "/Profile/MiddleName").setValue(profile.getMiddleName());
+				configuration.getStringValue(sonePrefix + "/Profile/LastName").setValue(profile.getLastName());
+				int postId = 0;
+				for (Post post : sone.getPosts()) {
+					String postPrefix = sonePrefix + "/Post." + postId++;
+					configuration.getStringValue(postPrefix + "/ID").setValue(post.getId());
+					configuration.getLongValue(postPrefix + "/Time").setValue(post.getTime());
+					configuration.getStringValue(postPrefix + "/Text").setValue(post.getText());
+				}
+				/* write null ID as terminator. */
+				configuration.getStringValue(sonePrefix + "/Post." + postId + "/ID").setValue(null);
+
+				int replyId = 0;
+				for (Reply reply : sone.getReplies()) {
+					String replyPrefix = sonePrefix + "/Reply." + replyId++;
+					configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId());
+					configuration.getStringValue(replyPrefix + "/Post").setValue(reply.getPost().getId());
+					configuration.getLongValue(replyPrefix + "/Time").setValue(reply.getTime());
+					configuration.getStringValue(replyPrefix + "/Text").setValue(reply.getText());
+				}
+				/* write null ID as terminator. */
+				configuration.getStringValue(sonePrefix + "/Reply." + replyId + "/ID").setValue(null);
+
+				int friendId = 0;
+				for (Sone friend : sone.getFriends()) {
+					String friendPrefix = sonePrefix + "/Friend." + friendId++;
+					configuration.getStringValue(friendPrefix + "/ID").setValue(friend.getId());
+					configuration.getStringValue(friendPrefix + "/Key").setValue(friend.getRequestUri().toString());
+					configuration.getStringValue(friendPrefix + "/Name").setValue(friend.getName());
+				}
+				/* write null ID as terminator. */
+				configuration.getStringValue(sonePrefix + "/Friend." + friendId + "/ID").setValue(null);
+
+				/* write all blocked Sones. */
+				int blockedSoneCounter = 0;
+				for (String blockedSoneId : sone.getBlockedSoneIds()) {
+					String blockedSonePrefix = sonePrefix + "/BlockedSone." + blockedSoneCounter++;
+					configuration.getStringValue(blockedSonePrefix + "/ID").setValue(blockedSoneId);
+				}
+				configuration.getStringValue(sonePrefix + "/BlockedSone." + blockedSoneCounter + "/ID").setValue(null);
+
+				/* write all liked posts. */
+				int likedPostIdCounter = 0;
+				for (String soneLikedPostId : sone.getLikedPostIds()) {
+					String likedPostIdPrefix = sonePrefix + "/LikedPostId." + likedPostIdCounter++;
+					configuration.getStringValue(likedPostIdPrefix + "/ID").setValue(soneLikedPostId);
+				}
+				configuration.getStringValue(sonePrefix + "/LikedPostId." + likedPostIdCounter + "/ID").setValue(null);
+
 			}
+			/* write null ID as terminator. */
+			configuration.getStringValue("Sone/Sone." + soneId + "/ID").setValue(null);
+
+			/* write all known Sones. */
+			int knownSonesCounter = 0;
+			for (Sone knownSone : getRemoteSones()) {
+				String knownSonePrefix = "KnownSone." + knownSonesCounter++;
+				configuration.getStringValue(knownSonePrefix + "/ID").setValue(knownSone.getId());
+				configuration.getStringValue(knownSonePrefix + "/Name").setValue(knownSone.getName());
+				configuration.getStringValue(knownSonePrefix + "/Key").setValue(knownSone.getRequestUri().toString());
+				/* TODO - store all known stuff? */
+			}
+			configuration.getStringValue("KnownSone." + knownSonesCounter + "/ID").setValue(null);
+
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.WARNING, "Could not store configuration!", ce1);
 		}