X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=2160ab8db49b50a7cbf9c09cdd96cbf88e1dd8bc;hb=356a84e5ec2bb0936b7d1cdc635f7f051788da6a;hp=2133b56d7ae65226a605ece86a8978c446f25873;hpb=94a58c591d942918b1f7f25c04be04102cd5156d;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 2133b56..2160ab8 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -160,7 +160,7 @@ public class SoneInserter extends AbstractService {
 	protected void serviceRun() {
 		long lastModificationTime = 0;
 		String lastFingerprint = "";
-		while (!shouldStop()) {
+		while (!shouldStop()) { try {
 			/* check every seconds. */
 			sleep(1000);
 
@@ -204,7 +204,7 @@ public class SoneInserter extends AbstractService {
 					core.setSoneStatus(sone, SoneStatus.inserting);
 					long insertTime = System.currentTimeMillis();
 					insertInformation.setTime(insertTime);
-					FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri().setKeyType("USK").setSuggestedEdition(0), insertInformation.generateManifestEntries(), "index.html");
+					FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
 					/* at this point we might already be stopped. */
 					if (shouldStop()) {
 						/* if so, bail out, don’t change anything. */
@@ -236,7 +236,9 @@ public class SoneInserter extends AbstractService {
 					}
 				}
 			}
-		}
+		} catch (Throwable t1) {
+			logger.log(Level.SEVERE, "SoneInserter threw an Exception!", t1);
+		}}
 	}
 
 	/**
@@ -246,7 +248,7 @@ public class SoneInserter extends AbstractService {
 	 *
 	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
-	private class InsertInformation {
+	private static class InsertInformation {
 
 		/** All properties of the Sone, copied for thread safety. */
 		private final Map<String, Object> soneProperties = new HashMap<String, Object>();
@@ -268,6 +270,7 @@ public class SoneInserter extends AbstractService {
 			soneProperties.put("replies", new HashSet<Reply>(sone.getReplies()));
 			soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
 			soneProperties.put("likedReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
+			soneProperties.put("albums", Sone.flattenAlbums(sone.getAlbums()));
 		}
 
 		//