X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=47a77ee496c4d06d70de5d26d8264fb4a91ddd60;hp=6d90516c64b3bf07e796019ec68e75bf80eb7e73;hb=01540cbd527e955dac1e41c2e6855a89ab12605c;hpb=92737bf9d3c70eaa015434ae714a67995df4f6d4

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 6d90516..47a77ee 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -49,6 +49,8 @@ import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidParentAlbumFou
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostReplyFound;
 import net.pterodactylus.sone.core.Options.DefaultOption;
+import net.pterodactylus.sone.core.SoneChangeDetector.PostProcessor;
+import net.pterodactylus.sone.core.SoneChangeDetector.PostReplyProcessor;
 import net.pterodactylus.sone.core.SoneInserter.SetInsertionDelay;
 import net.pterodactylus.sone.core.event.ImageInsertFinishedEvent;
 import net.pterodactylus.sone.core.event.MarkPostKnownEvent;
@@ -766,8 +768,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			logger.log(Level.WARNING, "Given Identity is null!");
 			return null;
 		}
-		final Long latestEdition = fromNullable(tryParse(
-				identity.getProperty("Sone.LatestEdition"))).or(0L);
+		final Long latestEdition = tryParse(fromNullable(
+				identity.getProperty("Sone.LatestEdition")).or("0"));
 		synchronized (sones) {
 			final Sone sone = getRemoteSone(identity.getId(), true);
 			if (sone.isLocal()) {
@@ -946,7 +948,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *            {@code true} if the stored Sone should be updated regardless
 	 *            of the age of the given Sone
 	 */
-	public void updateSone(Sone sone, boolean soneRescueMode) {
+	public void updateSone(final Sone sone, boolean soneRescueMode) {
 		Optional<Sone> storedSone = getSone(sone.getId());
 		if (storedSone.isPresent()) {
 			if (!soneRescueMode && !(sone.getTime() > storedSone.get().getTime())) {
@@ -954,72 +956,41 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				return;
 			}
 			/* find removed posts. */
-			Collection<Post> removedPosts = new ArrayList<Post>();
-			Collection<Post> newPosts = new ArrayList<Post>();
-			Collection<Post> existingPosts = database.getPosts(sone.getId());
-			for (Post oldPost : existingPosts) {
-				if (!sone.getPosts().contains(oldPost)) {
-					removedPosts.add(oldPost);
-				}
-			}
-			/* find new posts. */
-			for (Post newPost : sone.getPosts()) {
-				if (existingPosts.contains(newPost)) {
-					continue;
-				}
-				if (newPost.getTime() < getSoneFollowingTime(sone)) {
-					newPost.setKnown(true);
-				} else if (!newPost.isKnown()) {
-					newPosts.add(newPost);
-				}
-			}
-			/* store posts. */
-			database.storePosts(sone, sone.getPosts());
-			Collection<PostReply> newPostReplies = new ArrayList<PostReply>();
-			Collection<PostReply> removedPostReplies = new ArrayList<PostReply>();
-			if (!soneRescueMode) {
-				for (PostReply reply : storedSone.get().getReplies()) {
-					if (!sone.getReplies().contains(reply)) {
-						removedPostReplies.add(reply);
+			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));
 					}
 				}
-			}
-			Set<PostReply> storedReplies = storedSone.get().getReplies();
-			for (PostReply reply : sone.getReplies()) {
-				if (storedReplies.contains(reply)) {
-					continue;
-				}
-				if (reply.getTime() < getSoneFollowingTime(sone)) {
-					reply.setKnown(true);
-				} else if (!reply.isKnown()) {
-					newPostReplies.add(reply);
+			});
+			soneChangeDetector.onRemovedPosts(new PostProcessor() {
+				@Override
+				public void processPost(Post post) {
+					eventBus.post(new PostRemovedEvent(post));
 				}
-			}
-			database.storePostReplies(sone, sone.getReplies());
-			for (Album album : storedSone.get().getRootAlbum().getAlbums()) {
-				database.removeAlbum(album);
-				for (Image image : album.getImages()) {
-					database.removeImage(image);
+			});
+			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));
+					}
 				}
-			}
-			for (Post removedPost : removedPosts) {
-				eventBus.post(new PostRemovedEvent(removedPost));
-			}
-			for (Post newPost : newPosts) {
-				eventBus.post(new NewPostFoundEvent(newPost));
-			}
-			for (PostReply removedPostReply : removedPostReplies) {
-				eventBus.post(new PostReplyRemovedEvent(removedPostReply));
-			}
-			for (PostReply newPostReply : newPostReplies) {
-				eventBus.post(new NewPostReplyFoundEvent(newPostReply));
-			}
-			for (Album album : toAllAlbums.apply(sone)) {
-				database.storeAlbum(album);
-				for (Image image : album.getImages()) {
-					database.storeImage(image);
+			});
+			soneChangeDetector.onRemovedPostReplies(new PostReplyProcessor() {
+				@Override
+				public void processPostReply(PostReply postReply) {
+					eventBus.post(new PostReplyRemovedEvent(postReply));
 				}
-			}
+			});
+			soneChangeDetector.detectChanges(sone);
+			database.storeSone(sone);
 			synchronized (sones) {
 				sone.setOptions(storedSone.get().getOptions());
 				sone.setKnown(storedSone.get().isKnown());
@@ -1952,19 +1923,14 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		OwnIdentity ownIdentity = identityRemovedEvent.ownIdentity();
 		Identity identity = identityRemovedEvent.identity();
 		trustedIdentities.remove(ownIdentity, identity);
-		boolean foundIdentity = false;
 		for (Entry<OwnIdentity, Collection<Identity>> trustedIdentity : trustedIdentities.asMap().entrySet()) {
 			if (trustedIdentity.getKey().equals(ownIdentity)) {
 				continue;
 			}
 			if (trustedIdentity.getValue().contains(identity)) {
-				foundIdentity = true;
+				return;
 			}
 		}
-		if (foundIdentity) {
-			/* some local identity still trusts this identity, don’t remove. */
-			return;
-		}
 		Optional<Sone> sone = getSone(identity.getId());
 		if (!sone.isPresent()) {
 			/* TODO - we don’t have the Sone anymore. should this happen? */