X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=9f45e2e1610433acd9e8c85669fc5ad4f6777d21;hp=393697585c8b73d62023f5296978c1f3413abe46;hb=c9e306ac8e3ada846e87a0cc256a20fc148f381c;hpb=25ca7aaaa3b481e1d22d907427d53c83387b1a55

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 3936975..9f45e2e 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -27,12 +27,15 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.pterodactylus.sone.core.Core.SoneStatus;
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
 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.collection.ListBuilder;
+import net.pterodactylus.util.collection.ReverseComparator;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
@@ -81,6 +84,9 @@ public class SoneInserter extends AbstractService {
 	/** The Sone to insert. */
 	private final Sone sone;
 
+	/** The insert listener manager. */
+	private SoneInsertListenerManager soneInsertListenerManager;
+
 	/** Whether a modification has been detected. */
 	private volatile boolean modified = false;
 
@@ -102,6 +108,31 @@ public class SoneInserter extends AbstractService {
 		this.core = core;
 		this.freenetInterface = freenetInterface;
 		this.sone = sone;
+		this.soneInsertListenerManager = new SoneInsertListenerManager(sone);
+	}
+
+	//
+	// LISTENER MANAGEMENT
+	//
+
+	/**
+	 * Adds a listener for Sone insert events.
+	 *
+	 * @param soneInsertListener
+	 *            The Sone insert listener
+	 */
+	public void addSoneInsertListener(SoneInsertListener soneInsertListener) {
+		soneInsertListenerManager.addListener(soneInsertListener);
+	}
+
+	/**
+	 * Removes a listener for Sone insert events.
+	 *
+	 * @param soneInsertListener
+	 *            The Sone insert listener
+	 */
+	public void removeSoneInsertListener(SoneInsertListener soneInsertListener) {
+		soneInsertListenerManager.removeListener(soneInsertListener);
 	}
 
 	//
@@ -159,6 +190,7 @@ public class SoneInserter extends AbstractService {
 	@Override
 	protected void serviceRun() {
 		long lastModificationTime = 0;
+		String lastInsertedFingerprint = lastInsertFingerprint;
 		String lastFingerprint = "";
 		while (!shouldStop()) { try {
 			/* check every seconds. */
@@ -168,7 +200,7 @@ public class SoneInserter extends AbstractService {
 			if (core.isLocked(sone)) {
 				/* trigger redetection when the Sone is unlocked. */
 				synchronized (sone) {
-					modified = !sone.getFingerprint().equals(lastInsertFingerprint);
+					modified = !sone.getFingerprint().equals(lastInsertedFingerprint);
 				}
 				lastFingerprint = "";
 				lastModificationTime = 0;
@@ -179,32 +211,34 @@ public class SoneInserter extends AbstractService {
 			synchronized (sone) {
 				String fingerprint = sone.getFingerprint();
 				if (!fingerprint.equals(lastFingerprint)) {
-					if (fingerprint.equals(lastInsertFingerprint)) {
+					if (fingerprint.equals(lastInsertedFingerprint)) {
 						modified = false;
 						lastModificationTime = 0;
-						logger.log(Level.FINE, "Sone %s has been reverted to last insert state.", sone);
+						logger.log(Level.FINE, String.format("Sone %s has been reverted to last insert state.", sone));
 					} else {
 						lastModificationTime = System.currentTimeMillis();
 						modified = true;
-						logger.log(Level.FINE, "Sone %s has been modified, waiting %d seconds before inserting.", new Object[] { sone.getName(), insertionDelay });
+						logger.log(Level.FINE, String.format("Sone %s has been modified, waiting %d seconds before inserting.", sone.getName(), insertionDelay));
 					}
 					lastFingerprint = fingerprint;
 				}
 				if (modified && (lastModificationTime > 0) && ((System.currentTimeMillis() - lastModificationTime) > (insertionDelay * 1000))) {
-					lastInsertFingerprint = fingerprint;
+					lastInsertedFingerprint = fingerprint;
 					insertInformation = new InsertInformation(sone);
 				}
 			}
 
 			if (insertInformation != null) {
-				logger.log(Level.INFO, "Inserting Sone “%s”…", new Object[] { sone.getName() });
+				logger.log(Level.INFO, String.format("Inserting Sone “%s”…", sone.getName()));
 
 				boolean success = false;
 				try {
-					core.setSoneStatus(sone, SoneStatus.inserting);
+					sone.setStatus(SoneStatus.inserting);
 					long insertTime = System.currentTimeMillis();
 					insertInformation.setTime(insertTime);
+					soneInsertListenerManager.fireInsertStarted();
 					FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
+					soneInsertListenerManager.fireInsertFinished(System.currentTimeMillis() - insertTime);
 					/* at this point we might already be stopped. */
 					if (shouldStop()) {
 						/* if so, bail out, don’t change anything. */
@@ -212,13 +246,14 @@ public class SoneInserter extends AbstractService {
 					}
 					sone.setTime(insertTime);
 					sone.setLatestEdition(finalUri.getEdition());
-					core.saveSone(sone);
+					core.touchConfiguration();
 					success = true;
-					logger.log(Level.INFO, "Inserted Sone “%s” at %s.", new Object[] { sone.getName(), finalUri });
+					logger.log(Level.INFO, String.format("Inserted Sone “%s” at %s.", sone.getName(), finalUri));
 				} catch (SoneException se1) {
-					logger.log(Level.WARNING, "Could not insert Sone “" + sone.getName() + "”!", se1);
+					soneInsertListenerManager.fireInsertAborted(se1);
+					logger.log(Level.WARNING, String.format("Could not insert Sone “%s”!", sone.getName()), se1);
 				} finally {
-					core.setSoneStatus(sone, SoneStatus.idle);
+					sone.setStatus(SoneStatus.idle);
 				}
 
 				/*
@@ -227,10 +262,11 @@ public class SoneInserter extends AbstractService {
 				 */
 				if (success) {
 					synchronized (sone) {
-						if (lastInsertFingerprint.equals(sone.getFingerprint())) {
-							logger.log(Level.FINE, "Sone “%s” was not modified further, resetting counter…", new Object[] { sone });
-							core.saveSone(sone);
+						if (lastInsertedFingerprint.equals(sone.getFingerprint())) {
+							logger.log(Level.FINE, String.format("Sone “%s” was not modified further, resetting counter…", sone));
 							lastModificationTime = 0;
+							lastInsertFingerprint = lastInsertedFingerprint;
+							core.touchConfiguration();
 							modified = false;
 						}
 					}
@@ -248,7 +284,7 @@ public class SoneInserter extends AbstractService {
 	 *
 	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
-	private static class InsertInformation {
+	private class InsertInformation {
 
 		/** All properties of the Sone, copied for thread safety. */
 		private final Map<String, Object> soneProperties = new HashMap<String, Object>();
@@ -266,10 +302,11 @@ public class SoneInserter extends AbstractService {
 			soneProperties.put("requestUri", sone.getRequestUri());
 			soneProperties.put("insertUri", sone.getInsertUri());
 			soneProperties.put("profile", sone.getProfile());
-			soneProperties.put("posts", new ArrayList<Post>(sone.getPosts()));
-			soneProperties.put("replies", new HashSet<Reply>(sone.getReplies()));
+			soneProperties.put("posts", new ListBuilder<Post>(new ArrayList<Post>(sone.getPosts())).sort(Post.TIME_COMPARATOR).get());
+			soneProperties.put("replies", new ListBuilder<PostReply>(new ArrayList<PostReply>(sone.getReplies())).sort(new ReverseComparator<Reply<?>>(Reply.TIME_COMPARATOR)).get());
 			soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
 			soneProperties.put("likedReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
+			soneProperties.put("albums", sone.getAllAlbums());
 		}
 
 		//
@@ -339,14 +376,16 @@ public class SoneInserter extends AbstractService {
 				templateInputStreamReader = new InputStreamReader(getClass().getResourceAsStream(templateName), utf8Charset);
 				template = TemplateParser.parse(templateInputStreamReader);
 			} catch (TemplateException te1) {
-				logger.log(Level.SEVERE, "Could not parse template “" + templateName + "”!", te1);
+				logger.log(Level.SEVERE, String.format("Could not parse template “%s”!", templateName), te1);
 				return null;
 			} finally {
 				Closer.close(templateInputStreamReader);
 			}
 
 			TemplateContext templateContext = templateContextFactory.createTemplateContext();
+			templateContext.set("core", core);
 			templateContext.set("currentSone", soneProperties);
+			templateContext.set("currentEdition", core.getUpdateChecker().getLatestEdition());
 			templateContext.set("version", SonePlugin.VERSION);
 			StringWriter writer = new StringWriter();
 			StringBucket bucket = null;
@@ -355,7 +394,7 @@ public class SoneInserter extends AbstractService {
 				bucket = new StringBucket(writer.toString(), utf8Charset);
 				return new ManifestElement(name, bucket, contentType, bucket.size());
 			} catch (TemplateException te1) {
-				logger.log(Level.SEVERE, "Could not render template “" + templateName + "”!", te1);
+				logger.log(Level.SEVERE, String.format("Could not render template “%s”!", templateName), te1);
 				return null;
 			} finally {
 				Closer.close(writer);