X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=dc5e207125ea0f2e6d88359c2bf3da43714ebb5b;hb=82e3b3261d2fc90d3893df6d417a2828ce5f8ab3;hp=72e40900df05aa44c8ee56d6ee9a7094788191b6;hpb=f4d3720ef1fab42a063b70eff6ddc6c145e5122b;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 72e4090..dc5e207 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -25,6 +25,7 @@ import static java.lang.String.format;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -864,42 +865,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				logger.log(Level.FINE, String.format("Downloaded Sone %s is not newer than stored Sone %s.", sone, storedSone));
 				return;
 			}
-			/* find removed posts. */
-			SoneChangeDetector soneChangeDetector = new SoneChangeDetector(storedSone.get());
-			soneChangeDetector.onNewPosts(new PostProcessor() {
-				@Override
-				public void processPost(Post post) {
-					if (post.getTime() < getSoneFollowingTime(sone)) {
-						post.setKnown(true);
-					} else if (!post.isKnown()) {
-						eventBus.post(new NewPostFoundEvent(post));
-					}
-				}
-			});
-			soneChangeDetector.onRemovedPosts(new PostProcessor() {
-				@Override
-				public void processPost(Post post) {
-					eventBus.post(new PostRemovedEvent(post));
-				}
-			});
-			soneChangeDetector.onNewPostReplies(new PostReplyProcessor() {
-				@Override
-				public void processPostReply(PostReply postReply) {
-					if (postReply.getTime() < getSoneFollowingTime(sone)) {
-						postReply.setKnown(true);
-					} else if (!postReply.isKnown()) {
-						eventBus.post(new NewPostReplyFoundEvent(postReply));
-					}
-				}
-			});
-			soneChangeDetector.onRemovedPostReplies(new PostReplyProcessor() {
-				@Override
-				public void processPostReply(PostReply postReply) {
-					eventBus.post(new PostReplyRemovedEvent(postReply));
-				}
-			});
-			soneChangeDetector.detectChanges(sone);
+			List<Object> events =
+					collectEventsForChangesInSone(storedSone.get(), sone);
 			database.storeSone(sone);
+			for (Object event : events) {
+				eventBus.post(event);
+			}
 			sone.setOptions(storedSone.get().getOptions());
 			sone.setKnown(storedSone.get().isKnown());
 			sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
@@ -909,6 +880,47 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		}
 	}
 
+	private List<Object> collectEventsForChangesInSone(Sone oldSone,
+			final Sone newSone) {
+		final List<Object> events = new ArrayList<Object>();
+		SoneChangeDetector soneChangeDetector = new SoneChangeDetector(
+				oldSone);
+		soneChangeDetector.onNewPosts(new PostProcessor() {
+			@Override
+			public void processPost(Post post) {
+				if (post.getTime() < getSoneFollowingTime(newSone)) {
+					post.setKnown(true);
+				} else if (!post.isKnown()) {
+					events.add(new NewPostFoundEvent(post));
+				}
+			}
+		});
+		soneChangeDetector.onRemovedPosts(new PostProcessor() {
+			@Override
+			public void processPost(Post post) {
+				events.add(new PostRemovedEvent(post));
+			}
+		});
+		soneChangeDetector.onNewPostReplies(new PostReplyProcessor() {
+			@Override
+			public void processPostReply(PostReply postReply) {
+				if (postReply.getTime() < getSoneFollowingTime(newSone)) {
+					postReply.setKnown(true);
+				} else if (!postReply.isKnown()) {
+					events.add(new NewPostReplyFoundEvent(postReply));
+				}
+			}
+		});
+		soneChangeDetector.onRemovedPostReplies(new PostReplyProcessor() {
+			@Override
+			public void processPostReply(PostReply postReply) {
+				events.add(new PostReplyRemovedEvent(postReply));
+			}
+		});
+		soneChangeDetector.detectChanges(newSone);
+		return events;
+	}
+
 	/**
 	 * Deletes the given Sone. This will remove the Sone from the
 	 * {@link #getLocalSones() local Sones}, stop its {@link SoneInserter} and