X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=dfe8074f5fd28d14c90b49081fcc391c5b1103b0;hp=97182c2f2ca4004981d2694c7f5b844a5e44fd80;hb=b9281ba712aac6ea70b7dc217607608ae80b594d;hpb=a7bfeae4450d7d4aecc7499f894b90eea40480f0

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 97182c2..dfe8074 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -96,6 +96,7 @@ import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.thread.NamedThreadFactory;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
@@ -318,6 +319,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		return database.getSones();
 	}
 
+	@Override
+	public Function<String, Optional<Sone>> soneLoader() {
+		return database.soneLoader();
+	}
+
 	/**
 	 * Returns the Sone with the given ID, regardless whether it’s local or
 	 * remote.
@@ -865,41 +871,8 @@ 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;
 			}
-			final List<Object> events = new ArrayList<Object>();
-			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()) {
-						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(sone)) {
-						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(sone);
+			List<Object> events =
+					collectEventsForChangesInSone(storedSone.get(), sone);
 			database.storeSone(sone);
 			for (Object event : events) {
 				eventBus.post(event);
@@ -913,6 +886,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