X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=dfa94d68264876f4d9862ccc69a015afc566092b;hb=a21f960ba3105942000efc5892836bbff37530ae;hp=932f3e76028163adb7ec9d7e78c0373112c998a8;hpb=16bc7c806b2649c3d9a542089c2dd686f8a4e697;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 932f3e7..dfa94d6 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -29,8 +29,14 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.SoneException.Type;
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostShell;
 import net.pterodactylus.sone.data.Profile;
+import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.ReplyShell;
+import net.pterodactylus.sone.data.Shell;
+import net.pterodactylus.sone.data.ShellCache;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.SoneShell;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
 import net.pterodactylus.util.logging.Logging;
@@ -59,6 +65,17 @@ public class Core extends AbstractService {
 	/** Sone inserters. */
 	private final Map<Sone, SoneInserter> soneInserters = new HashMap<Sone, SoneInserter>();
 
+	/* various caches follow here. */
+
+	/** Cache for all known Sones. */
+	private final ShellCache<Sone> soneCache = new ShellCache<Sone>(SoneShell.creator);
+
+	/** Cache for all known posts. */
+	private final ShellCache<Post> postCache = new ShellCache<Post>(PostShell.creator);
+
+	/** Cache for all known replies. */
+	private final ShellCache<Reply> replyCache = new ShellCache<Reply>(ReplyShell.creator);
+
 	/**
 	 * Creates a new core.
 	 */
@@ -103,6 +120,21 @@ public class Core extends AbstractService {
 		return Collections.unmodifiableSet(localSones);
 	}
 
+	/**
+	 * Returns a Sone or a {@link Shell} around one for the given ID.
+	 *
+	 * @param soneId
+	 *            The ID of the Sone
+	 * @return The Sone, or a {@link Shell} around one
+	 */
+	public Sone getSone(String soneId) {
+		Sone sone = soneCache.get(soneId);
+		if (sone instanceof SoneShell) {
+			soneCache.put(soneId, sone = ((SoneShell) sone).getShelled());
+		}
+		return sone;
+	}
+
 	//
 	// ACTIONS
 	//
@@ -115,6 +147,7 @@ public class Core extends AbstractService {
 	 */
 	public void addSone(Sone sone) {
 		if (localSones.add(sone)) {
+			soneCache.put(sone.getId(), sone);
 			SoneInserter soneInserter = new SoneInserter(freenetInterface, sone);
 			soneInserter.start();
 			soneInserters.put(sone, soneInserter);
@@ -168,7 +201,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 = new Sone(UUID.randomUUID(), name, new FreenetURI(finalRequestUri), new FreenetURI(finalInsertUri));
+			sone = new Sone(UUID.randomUUID(), name, new FreenetURI(finalRequestUri).setKeyType("USK").setDocName("Sone-" + name), new FreenetURI(finalInsertUri).setKeyType("USK").setDocName("Sone-" + name));
 			sone.setProfile(new Profile());
 			/* set modification counter to 1 so it is inserted immediately. */
 			sone.setModificationCounter(1);
@@ -176,7 +209,6 @@ public class Core extends AbstractService {
 		} catch (MalformedURLException mue1) {
 			throw new SoneException(Type.INVALID_URI);
 		}
-		localSones.add(sone);
 		return sone;
 	}
 
@@ -248,6 +280,7 @@ public class Core extends AbstractService {
 				profile.setMiddleName(middleName);
 				profile.setLastName(lastName);
 				Sone sone = new Sone(UUID.fromString(id), name, new FreenetURI(requestUri), new FreenetURI(insertUri));
+				soneCache.put(id, sone);
 				sone.setProfile(profile);
 				int postId = 0;
 				do {
@@ -259,8 +292,28 @@ public class Core extends AbstractService {
 					long time = configuration.getLongValue(postPrefix + "/Time").getValue(null);
 					String text = configuration.getStringValue(postPrefix + "/Text").getValue(null);
 					Post post = new Post(UUID.fromString(id), sone, time, text);
+					postCache.put(id, post);
 					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;
+					}
+					Sone replySone = soneCache.get(configuration.getStringValue(replyPrefix + "/Sone/ID").getValue(null));
+					String replySoneKey = configuration.getStringValue(replyPrefix + "/Sone/Key").getValue(null);
+					String replySoneName = configuration.getStringValue(replyPrefix + "/Sone/Name").getValue(null);
+					if (replySone instanceof SoneShell) {
+						((SoneShell) replySone).setRequestUri(new FreenetURI(replySoneKey)).setName(replySoneName);
+					}
+					Post replyPost = postCache.get(configuration.getStringValue(replyPrefix + "/Post").getValue(null));
+					long replyTime = configuration.getLongValue(replyPrefix + "/Time").getValue(null);
+					String replyText = configuration.getStringValue(replyPrefix + "/Text").getValue(null);
+					Reply reply = new ReplyShell().setSone(replySone).setPost(replyPost).setTime(replyTime).setText(replyText).getShelled();
+					replyCache.put(replyId, reply);
+				} while (true);
 				sone.setModificationCounter(modificationCounter);
 				addSone(sone);
 			} catch (MalformedURLException mue1) {
@@ -299,7 +352,26 @@ public class Core extends AbstractService {
 					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 + "/Sone/ID").setValue(reply.getSone().getId());
+					configuration.getStringValue(replyPrefix + "/Sone/Key").setValue(reply.getSone().getRequestUri().toString());
+					configuration.getStringValue(replyPrefix + "/Sone/Name").setValue(reply.getSone().getName());
+					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);
 			}
+			/* write null ID as terminator. */
+			configuration.getStringValue("Sone/Sone." + soneId + "/ID").setValue(null);
+
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.WARNING, "Could not store configuration!", ce1);
 		}