X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=79a6259f0b09286e164e7f11dce74629ccbadc46;hp=f544ef2e1e8bf17817dff0482318f15a7042e5e1;hb=179e7da4d8d8a474d0b622d60b5f5d32d6ab4052;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..79a6259 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SoneInserter.java - Copyright © 2010–2013 David Roden
+ * Sone - SoneInserter.java - Copyright © 2010–2019 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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,24 +58,25 @@ import net.pterodactylus.util.template.TemplateParser;
 import net.pterodactylus.util.template.XmlFilter;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
+import com.google.common.base.Charsets;
 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.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 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);
@@ -120,20 +122,20 @@ public class SoneInserter extends AbstractService {
 		this(core, eventBus, freenetInterface, soneId, new SoneModificationDetector(new LockableFingerprintProvider() {
 			@Override
 			public boolean isLocked() {
-				final Optional<Sone> sone = core.getSone(soneId);
-				if (!sone.isPresent()) {
+				Sone sone = core.getSone(soneId);
+				if (sone == null) {
 					return false;
 				}
-				return core.isLocked(sone.get());
+				return core.isLocked(sone);
 			}
 
 			@Override
 			public String getFingerprint() {
-				final Optional<Sone> sone = core.getSone(soneId);
-				if (!sone.isPresent()) {
+				Sone sone = core.getSone(soneId);
+				if (sone == null) {
 					return null;
 				}
-				return sone.get().getFingerprint();
+				return sone.getFingerprint();
 			}
 		}, insertionDelay), 1000);
 	}
@@ -175,7 +177,7 @@ public class SoneInserter extends AbstractService {
 	 * @return The fingerprint of the last insert
 	 */
 	public String getLastInsertFingerprint() {
-		return soneModificationDetector.getOriginalFingerprint();
+		return soneModificationDetector.getLastInsertFingerprint();
 	}
 
 	/**
@@ -214,12 +216,11 @@ public class SoneInserter extends AbstractService {
 				sleep(delay);
 
 				if (soneModificationDetector.isEligibleForInsert()) {
-					Optional<Sone> soneOptional = core.getSone(soneId);
-					if (!soneOptional.isPresent()) {
+					Sone sone = core.getSone(soneId);
+					if (sone == null) {
 						logger.log(Level.WARNING, format("Sone %s has disappeared, exiting inserter.", soneId));
 						return;
 					}
-					Sone sone = soneOptional.get();
 					InsertInformation insertInformation = new InsertInformation(sone);
 					logger.log(Level.INFO, String.format("Inserting Sone “%s”…", sone.getName()));
 
@@ -229,7 +230,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 +245,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);
 					}
 
@@ -276,12 +278,12 @@ public class SoneInserter extends AbstractService {
 	 * Container for information that are required to insert a Sone. This
 	 * container merely exists to copy all relevant data without holding a lock
 	 * on the {@link Sone} object for too long.
-	 *
-	 * @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<>();
 		private final String fingerprint;
 		private final ManifestCreator manifestCreator;
 
@@ -293,16 +295,16 @@ public class SoneInserter extends AbstractService {
 		 */
 		public InsertInformation(Sone sone) {
 			this.fingerprint = sone.getFingerprint();
-			Map<String, Object> soneProperties = new HashMap<String, Object>();
+			Map<String, Object> soneProperties = new HashMap<>();
 			soneProperties.put("id", sone.getId());
 			soneProperties.put("name", sone.getName());
 			soneProperties.put("time", currentTimeMillis());
 			soneProperties.put("requestUri", sone.getRequestUri());
 			soneProperties.put("profile", sone.getProfile());
-			soneProperties.put("posts", Ordering.from(Post.TIME_COMPARATOR).sortedCopy(sone.getPosts()));
+			soneProperties.put("posts", Ordering.from(Post.NEWEST_FIRST).sortedCopy(sone.getPosts()));
 			soneProperties.put("replies", Ordering.from(Reply.TIME_COMPARATOR).reverse().sortedCopy(sone.getReplies()));
-			soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
-			soneProperties.put("likedReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
+			soneProperties.put("likedPostIds", new HashSet<>(sone.getLikedPostIds()));
+			soneProperties.put("likedReplyIds", new HashSet<>(sone.getLikedReplyIds()));
 			soneProperties.put("albums", FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).filter(NOT_EMPTY).toList());
 			manifestCreator = new ManifestCreator(core, soneProperties);
 		}
@@ -326,7 +328,7 @@ public class SoneInserter extends AbstractService {
 		 * @return The manifest entries for the Sone insert
 		 */
 		public HashMap<String, Object> generateManifestEntries() {
-			HashMap<String, Object> manifestEntries = new HashMap<String, Object>();
+			HashMap<String, Object> manifestEntries = new HashMap<>();
 
 			/* first, create an index.html. */
 			manifestEntries.put("index.html", manifestCreator.createManifestElement(
@@ -341,18 +343,22 @@ public class SoneInserter extends AbstractService {
 			return manifestEntries;
 		}
 
+		@Override
+		public void close() {
+			manifestCreator.close();
+		}
+
 	}
 
 	/**
 	 * Creates manifest elements for an insert by rendering a template.
-	 *
-	 * @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<>();
 
 		ManifestCreator(Core core, Map<String, Object> soneProperties) {
 			this.core = core;
@@ -379,21 +385,24 @@ public class SoneInserter extends AbstractService {
 			templateContext.set("core", core);
 			templateContext.set("currentSone", soneProperties);
 			templateContext.set("currentEdition", core.getUpdateChecker().getLatestEdition());
-			templateContext.set("version", SonePlugin.VERSION);
+			templateContext.set("version", SonePlugin.getPluginVersion());
 			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();
 			}
 		}