X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=eb74dc0132b5567d2fa5745b537ec195af34fc73;hb=43a21f859e9fec31096c1540148bdd44a8e3702f;hp=aa2062c221c1e53de9ed8f3c43e0d0de639a1346;hpb=b90831223c33e2284b409f9745151363e61f16aa;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 aa2062c..eb74dc0 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -29,6 +29,7 @@ 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.freenet.StringBucket;
@@ -83,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;
 
@@ -104,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);
 	}
 
 	//
@@ -206,7 +235,9 @@ public class SoneInserter extends AbstractService {
 					core.setSoneStatus(sone, 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. */
@@ -214,10 +245,11 @@ 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 });
 				} catch (SoneException se1) {
+					soneInsertListenerManager.fireInsertAborted(se1);
 					logger.log(Level.WARNING, "Could not insert Sone “" + sone.getName() + "”!", se1);
 				} finally {
 					core.setSoneStatus(sone, SoneStatus.idle);
@@ -268,9 +300,10 @@ public class SoneInserter extends AbstractService {
 			soneProperties.put("insertUri", sone.getInsertUri());
 			soneProperties.put("profile", sone.getProfile());
 			soneProperties.put("posts", new ListBuilder<Post>(new ArrayList<Post>(sone.getPosts())).sort(Post.TIME_COMPARATOR).get());
-			soneProperties.put("replies", new ListBuilder<Reply>(new ArrayList<Reply>(sone.getReplies())).sort(new ReverseComparator<Reply>(Reply.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());
 		}
 
 		//