X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=3c3a659872c6d980607cbf43840f7e9f5c92aadd;hb=adf590c0b33f1cc3f136d8d3a714f7051407535f;hp=d0d585f0a48458eadb14cf8099d1b8f2b3c1e9fc;hpb=806ebfdf165123e880dd95c50b6aeaad25e52bb2;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 d0d585f..3c3a659 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -59,6 +59,9 @@ 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>();
 
@@ -108,6 +111,7 @@ public class Core extends AbstractService {
 	 */
 	public Core freenetInterface(FreenetInterface freenetInterface) {
 		this.freenetInterface = freenetInterface;
+		soneDownloader = new SoneDownloader(freenetInterface);
 		return this;
 	}
 
@@ -128,7 +132,11 @@ public class Core extends AbstractService {
 	 * @return The Sone, or a {@link Shell} around one
 	 */
 	public Sone getSone(String soneId) {
-		return soneCache.get(soneId);
+		Sone sone = soneCache.get(soneId);
+		if (sone instanceof SoneShell) {
+			soneCache.put(soneId, sone = ((SoneShell) sone).getShelled());
+		}
+		return sone;
 	}
 
 	//
@@ -143,8 +151,10 @@ 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();
+			soneDownloader.addSone(sone);
 			soneInserters.put(sone, soneInserter);
 		}
 	}
@@ -196,7 +206,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);
@@ -204,7 +214,6 @@ public class Core extends AbstractService {
 		} catch (MalformedURLException mue1) {
 			throw new SoneException(Type.INVALID_URI);
 		}
-		localSones.add(sone);
 		return sone;
 	}
 
@@ -237,6 +246,7 @@ public class Core extends AbstractService {
 	 */
 	@Override
 	protected void serviceStop() {
+		soneDownloader.stop();
 		/* stop all Sone inserters. */
 		for (SoneInserter soneInserter : soneInserters.values()) {
 			soneInserter.stop();
@@ -298,7 +308,12 @@ public class Core extends AbstractService {
 					if (replyId == null) {
 						break;
 					}
-					Sone replySone = soneCache.get(configuration.getStringValue(replyPrefix + "/Sone").getValue(null));
+					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);
@@ -343,16 +358,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").setValue(reply.getSone().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);
 		}