X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=45c617cd6afcda882dcd15db452d40c1cc7a94de;hp=f544ef2e1e8bf17817dff0482318f15a7042e5e1;hb=3a7092e48f27cba6286946442783f539ad73a911;hpb=aeed1ea944bcfa2cc057ba99d258c055e55a9e2d

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index f544ef2..45c617c 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -19,8 +19,10 @@ package net.pterodactylus.sone.core;
 
 import static java.lang.String.format;
 import static java.lang.System.currentTimeMillis;
+import static java.util.logging.Logger.getLogger;
 import static net.pterodactylus.sone.data.Album.NOT_EMPTY;
 
+import java.io.Closeable;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
@@ -28,6 +30,7 @@ import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -42,10 +45,8 @@ import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
-import net.pterodactylus.sone.freenet.StringBucket;
 import net.pterodactylus.sone.main.SonePlugin;
 import net.pterodactylus.util.io.Closer;
-import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.template.HtmlFilter;
 import net.pterodactylus.util.template.ReflectionAccessor;
@@ -57,14 +58,18 @@ import net.pterodactylus.util.template.TemplateParser;
 import net.pterodactylus.util.template.XmlFilter;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Charsets;
 import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Ordering;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 
-import freenet.client.async.ManifestElement;
 import freenet.keys.FreenetURI;
+import freenet.support.api.Bucket;
+import freenet.support.api.ManifestElement;
+import freenet.support.api.RandomAccessBucket;
+import freenet.support.io.ArrayBucket;
 
 /**
  * A Sone inserter is responsible for inserting a Sone if it has changed.
@@ -74,7 +79,7 @@ import freenet.keys.FreenetURI;
 public class SoneInserter extends AbstractService {
 
 	/** The logger. */
-	private static final Logger logger = Logging.getLogger(SoneInserter.class);
+	private static final Logger logger = getLogger(SoneInserter.class.getName());
 
 	/** The insertion delay (in seconds). */
 	private static final AtomicInteger insertionDelay = new AtomicInteger(60);
@@ -229,7 +234,7 @@ public class SoneInserter extends AbstractService {
 						long insertTime = currentTimeMillis();
 						eventBus.post(new SoneInsertingEvent(sone));
 						FreenetURI finalUri = freenetInterface.insertDirectory(sone.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
-						eventBus.post(new SoneInsertedEvent(sone, currentTimeMillis() - insertTime));
+						eventBus.post(new SoneInsertedEvent(sone, currentTimeMillis() - insertTime, insertInformation.getFingerprint()));
 						/* at this point we might already be stopped. */
 						if (shouldStop()) {
 							/* if so, bail out, don’t change anything. */
@@ -244,6 +249,7 @@ public class SoneInserter extends AbstractService {
 						eventBus.post(new SoneInsertAbortedEvent(sone, se1));
 						logger.log(Level.WARNING, String.format("Could not insert Sone “%s”!", sone.getName()), se1);
 					} finally {
+						insertInformation.close();
 						sone.setStatus(SoneStatus.idle);
 					}
 
@@ -280,8 +286,10 @@ public class SoneInserter extends AbstractService {
 	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
 	@VisibleForTesting
-	class InsertInformation {
+	class InsertInformation implements Closeable {
 
+		/** All properties of the Sone, copied for thread safety. */
+		private final Map<String, Object> soneProperties = new HashMap<String, Object>();
 		private final String fingerprint;
 		private final ManifestCreator manifestCreator;
 
@@ -341,6 +349,11 @@ public class SoneInserter extends AbstractService {
 			return manifestEntries;
 		}
 
+		@Override
+		public void close() {
+			manifestCreator.close();
+		}
+
 	}
 
 	/**
@@ -349,10 +362,11 @@ public class SoneInserter extends AbstractService {
 	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
 	@VisibleForTesting
-	static class ManifestCreator {
+	static class ManifestCreator implements Closeable {
 
 		private final Core core;
 		private final Map<String, Object> soneProperties;
+		private final Set<Bucket> buckets = new HashSet<Bucket>();
 
 		ManifestCreator(Core core, Map<String, Object> soneProperties) {
 			this.core = core;
@@ -381,19 +395,22 @@ public class SoneInserter extends AbstractService {
 			templateContext.set("currentEdition", core.getUpdateChecker().getLatestEdition());
 			templateContext.set("version", SonePlugin.VERSION);
 			StringWriter writer = new StringWriter();
-			StringBucket bucket = null;
 			try {
 				template.render(templateContext, writer);
-				bucket = new StringBucket(writer.toString(), utf8Charset);
+				RandomAccessBucket bucket = new ArrayBucket(writer.toString().getBytes(Charsets.UTF_8));
+				buckets.add(bucket);
 				return new ManifestElement(name, bucket, contentType, bucket.size());
 			} catch (TemplateException te1) {
 				logger.log(Level.SEVERE, String.format("Could not render template “%s”!", templateName), te1);
 				return null;
 			} finally {
 				Closer.close(writer);
-				if (bucket != null) {
-					bucket.free();
-				}
+			}
+		}
+
+		public void close() {
+			for (Bucket bucket : buckets) {
+				bucket.free();
 			}
 		}