X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=7232b729b8f35f84aecde554b4d1a0f8e8b22305;hp=34d10bcdb918259a201ad0a68e3a6656f05a2419;hb=ce58ae7224b867106e255b5b8c345817dd3ed094;hpb=295f1e33bfcdb9d772e2de2a05b49f2feea92223 diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java index 34d10bc..7232b72 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -23,7 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -64,11 +63,11 @@ import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.data.Sone.ShowCustomAvatars; import net.pterodactylus.sone.data.Sone.SoneStatus; import net.pterodactylus.sone.data.TemporaryImage; +import net.pterodactylus.sone.database.Database; +import net.pterodactylus.sone.database.DatabaseException; import net.pterodactylus.sone.database.PostBuilder; -import net.pterodactylus.sone.database.PostDatabase; import net.pterodactylus.sone.database.PostProvider; import net.pterodactylus.sone.database.PostReplyBuilder; -import net.pterodactylus.sone.database.PostReplyBuilderFactory; import net.pterodactylus.sone.database.PostReplyProvider; import net.pterodactylus.sone.database.SoneProvider; import net.pterodactylus.sone.fcp.FcpInterface; @@ -90,13 +89,14 @@ import net.pterodactylus.util.number.Numbers; import net.pterodactylus.util.service.AbstractService; import net.pterodactylus.util.thread.NamedThreadFactory; -import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import com.google.common.collect.Collections2; import com.google.common.collect.FluentIterable; -import com.google.common.collect.Ordering; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Multimap; +import com.google.common.collect.Multimaps; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; import com.google.inject.Inject; @@ -178,23 +178,14 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, private final Set knownSones = new HashSet(); /** The post database. */ - private final PostDatabase postDatabase; - - /** The post reply builder factory. */ - private final PostReplyBuilderFactory postReplyBuilderFactory; - - /** All replies. */ - private final Map replies = new HashMap(); - - /** All known replies. */ - private final Set knownReplies = new HashSet(); + private final Database database; /** All bookmarked posts. */ /* synchronize access on itself. */ private final Set bookmarkedPosts = new HashSet(); /** Trusted identities, sorted by own identities. */ - private final Map> trustedIdentities = Collections.synchronizedMap(new HashMap>()); + private final Multimap trustedIdentities = Multimaps.synchronizedSetMultimap(HashMultimap.create()); /** All known albums. */ private final Map albums = new HashMap(); @@ -224,13 +215,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * The WebOfTrust updater * @param eventBus * The event bus - * @param postDatabase - * The post database - * @param postReplyBuilderFactory - * The post reply builder factory + * @param database + * The database */ @Inject - public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus, PostDatabase postDatabase, PostReplyBuilderFactory postReplyBuilderFactory) { + public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus, Database database) { super("Sone Core"); this.configuration = configuration; this.freenetInterface = freenetInterface; @@ -240,8 +229,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, this.updateChecker = new UpdateChecker(eventBus, freenetInterface); this.webOfTrustUpdater = webOfTrustUpdater; this.eventBus = eventBus; - this.postDatabase = postDatabase; - this.postReplyBuilderFactory = postReplyBuilderFactory; + this.database = database; } // @@ -372,13 +360,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, @Override public Collection getLocalSones() { synchronized (sones) { - return Collections2.filter(sones.values(), new Predicate() { + return FluentIterable.from(sones.values()).filter(new Predicate() { @Override public boolean apply(Sone sone) { return sone.isLocal(); } - }); + }).toSet(); } } @@ -413,13 +401,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, @Override public Collection getRemoteSones() { synchronized (sones) { - return Collections2.filter(sones.values(), new Predicate() { + return FluentIterable.from(sones.values()).filter(new Predicate() { @Override public boolean apply(Sone sone) { return !sone.isLocal(); } - }); + }).toSet(); } } @@ -483,7 +471,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, checkNotNull(origin, "origin must not be null"); checkNotNull(target, "target must not be null"); checkArgument(origin.getIdentity() instanceof OwnIdentity, "origin’s identity must be an OwnIdentity"); - return trustedIdentities.containsKey(origin.getIdentity()) && trustedIdentities.get(origin.getIdentity()).contains(target.getIdentity()); + return trustedIdentities.containsEntry(origin.getIdentity(), target.getIdentity()); } /** @@ -492,7 +480,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * @return A new post builder */ public PostBuilder postBuilder() { - return postDatabase.newPostBuilder(); + return database.newPostBuilder(); } /** @@ -500,7 +488,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, */ @Override public Optional getPost(String postId) { - return postDatabase.getPost(postId); + return database.getPost(postId); } /** @@ -508,7 +496,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, */ @Override public Collection getPosts(String soneId) { - return postDatabase.getPosts(soneId); + return database.getPosts(soneId); } /** @@ -517,7 +505,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, @Override public Collection getDirectedPosts(final String recipientId) { checkNotNull(recipientId, "recipient must not be null"); - return postDatabase.getDirectedPosts(recipientId); + return database.getDirectedPosts(recipientId); } /** @@ -526,7 +514,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * @return A new post reply builder */ public PostReplyBuilder postReplyBuilder() { - return postReplyBuilderFactory.newPostReplyBuilder(); + return database.newPostReplyBuilder(); } /** @@ -534,29 +522,15 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, */ @Override public Optional getPostReply(String replyId) { - synchronized (replies) { - return Optional.fromNullable(replies.get(replyId)); - } + return database.getPostReply(replyId); } /** * {@inheritDoc} */ @Override - public List getReplies(final Post post) { - return Ordering.from(Reply.TIME_COMPARATOR).sortedCopy(FluentIterable.from(getSones()).transformAndConcat(new Function>() { - - @Override - public Iterable apply(Sone sone) { - return sone.getReplies(); - } - }).filter(new Predicate() { - - @Override - public boolean apply(PostReply reply) { - return post.getId().equals(reply.getPostId()); - } - })); + public List getReplies(final String postId) { + return database.getReplies(postId); } /** @@ -779,7 +753,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, sone.setClient(new Client("Sone", SonePlugin.VERSION.toString())); sone.setKnown(true); /* TODO - load posts ’n stuff */ - trustedIdentities.put(ownIdentity, Collections.synchronizedSet(new HashSet())); sones.put(ownIdentity.getId(), sone); final SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, sone); soneInserters.put(sone, soneInserter); @@ -828,7 +801,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, return null; } synchronized (sones) { - final Sone sone = getRemoteSone(identity.getId(), true).setIdentity(identity); + final Sone sone = getRemoteSone(identity.getId(), true); + if (sone.isLocal()) { + return sone; + } + sone.setIdentity(identity); boolean newSone = sone.getRequestUri() == null; sone.setRequestUri(SoneUri.create(identity.getRequestUri())); sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0)); @@ -1017,7 +994,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, return; } /* find removed posts. */ - Collection existingPosts = postDatabase.getPosts(sone.getId()); + Collection existingPosts = database.getPosts(sone.getId()); for (Post oldPost : existingPosts) { if (!sone.getPosts().contains(oldPost)) { eventBus.post(new PostRemovedEvent(oldPost)); @@ -1035,32 +1012,26 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } } /* store posts. */ - postDatabase.storePosts(sone, sone.getPosts()); - synchronized (replies) { - if (!soneRescueMode) { - for (PostReply reply : storedSone.get().getReplies()) { - replies.remove(reply.getId()); - if (!sone.getReplies().contains(reply)) { - eventBus.post(new PostReplyRemovedEvent(reply)); - } + database.storePosts(sone, sone.getPosts()); + if (!soneRescueMode) { + for (PostReply reply : storedSone.get().getReplies()) { + if (!sone.getReplies().contains(reply)) { + eventBus.post(new PostReplyRemovedEvent(reply)); } } - Set storedReplies = storedSone.get().getReplies(); - synchronized (knownReplies) { - for (PostReply reply : sone.getReplies()) { - reply.setKnown(knownReplies.contains(reply.getId())); - if (!storedReplies.contains(reply)) { - if (reply.getTime() < getSoneFollowingTime(sone)) { - knownReplies.add(reply.getId()); - reply.setKnown(true); - } else if (!knownReplies.contains(reply.getId())) { - eventBus.post(new NewPostReplyFoundEvent(reply)); - } - } - replies.put(reply.getId(), reply); - } + } + Set 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()) { + eventBus.post(new NewPostReplyFoundEvent(reply)); } } + database.storePostReplies(sone, sone.getReplies()); synchronized (albums) { synchronized (images) { for (Album album : storedSone.get().getAlbums()) { @@ -1220,8 +1191,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, logger.log(Level.WARNING, "Invalid reply found, aborting load!"); return; } - PostReplyBuilder postReplyBuilder = postReplyBuilderFactory.newPostReplyBuilder(); - postReplyBuilder.withId(replyId).from(sone.getId()).to(postId).withTime(replyTime).withText(replyText); + PostReplyBuilder postReplyBuilder = postReplyBuilder().withId(replyId).from(sone.getId()).to(postId).withTime(replyTime).withText(replyText); replies.add(postReplyBuilder.build()); } @@ -1349,19 +1319,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, knownSones.add(friend); } } - postDatabase.storePosts(sone, posts); + database.storePosts(sone, posts); for (Post post : posts) { post.setKnown(true); } - synchronized (this.replies) { - for (PostReply postReply : replies) { - this.replies.put(postReply.getId(), postReply); - } - } - synchronized (knownReplies) { - for (PostReply reply : replies) { - knownReplies.add(reply.getId()); - } + database.storePostReplies(sone, replies); + for (PostReply reply : replies) { + reply.setKnown(true); } } @@ -1430,13 +1394,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, logger.log(Level.FINE, String.format("Tried to create post for non-local Sone: %s", sone)); return null; } - PostBuilder postBuilder = postDatabase.newPostBuilder(); + PostBuilder postBuilder = database.newPostBuilder(); postBuilder.from(sone.getId()).randomId().withTime(time).withText(text.trim()); if (recipient.isPresent()) { postBuilder.to(recipient.get().getId()); } final Post post = postBuilder.build(); - postDatabase.storePost(post); + database.storePost(post); eventBus.post(new NewPostFoundEvent(post)); sone.addPost(post); touchConfiguration(); @@ -1464,7 +1428,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, logger.log(Level.WARNING, String.format("Tried to delete post of non-local Sone: %s", post.getSone())); return; } - postDatabase.removePost(post); + database.removePost(post); eventBus.post(new PostRemovedEvent(post)); markPostKnown(post); touchConfiguration(); @@ -1481,7 +1445,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, post.setKnown(true); eventBus.post(new MarkPostKnownEvent(post)); touchConfiguration(); - for (PostReply reply : getReplies(post)) { + for (PostReply reply : getReplies(post.getId())) { markReplyKnown(reply); } } @@ -1548,15 +1512,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, logger.log(Level.FINE, String.format("Tried to create reply for non-local Sone: %s", sone)); return null; } - PostReplyBuilder postReplyBuilder = postReplyBuilderFactory.newPostReplyBuilder(); + PostReplyBuilder postReplyBuilder = postReplyBuilder(); postReplyBuilder.randomId().from(sone.getId()).to(post.getId()).currentTime().withText(text.trim()); final PostReply reply = postReplyBuilder.build(); - synchronized (replies) { - replies.put(reply.getId(), reply); - } - synchronized (knownReplies) { - eventBus.post(new NewPostReplyFoundEvent(reply)); - } + database.storePostReply(reply); + eventBus.post(new NewPostReplyFoundEvent(reply)); sone.addReply(reply); touchConfiguration(); localElementTicker.schedule(new Runnable() { @@ -1584,13 +1544,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, logger.log(Level.FINE, String.format("Tried to delete non-local reply: %s", reply)); return; } - synchronized (replies) { - replies.remove(reply.getId()); - } - synchronized (knownReplies) { - markReplyKnown(reply); - knownReplies.remove(reply.getId()); - } + database.removePostReply(reply); + markReplyKnown(reply); sone.removeReply(reply); touchConfiguration(); } @@ -1603,12 +1558,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * The reply to mark as known */ public void markReplyKnown(PostReply reply) { + boolean previouslyKnown = reply.isKnown(); reply.setKnown(true); - synchronized (knownReplies) { - eventBus.post(new MarkPostReplyKnownEvent(reply)); - if (knownReplies.add(reply.getId())) { - touchConfiguration(); - } + eventBus.post(new MarkPostReplyKnownEvent(reply)); + if (!previouslyKnown) { + touchConfiguration(); } } @@ -1785,6 +1739,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, identityManager.start(); webOfTrustUpdater.init(); webOfTrustUpdater.start(); + database.start(); } /** @@ -1819,6 +1774,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } } saveConfiguration(); + database.stop(); webOfTrustUpdater.stop(); updateChecker.stop(); soneDownloader.stop(); @@ -1917,7 +1873,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null); /* save albums. first, collect in a flat structure, top-level first. */ - List albums = sone.getAllAlbums(); + List albums = FluentIterable.from(sone.getAlbums()).transformAndConcat(Album.FLATTENER).toList(); int albumCounter = 0; for (Album album : albums) { @@ -2016,16 +1972,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } /* save known posts. */ - postDatabase.saveKnownPosts(configuration, "KnownPosts/"); - - /* save known replies. */ - int replyCounter = 0; - synchronized (knownReplies) { - for (String knownReplyId : knownReplies) { - configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").setValue(knownReplyId); - } - configuration.getStringValue("KnownReplies/" + replyCounter + "/ID").setValue(null); - } + database.save(); /* save bookmarked posts. */ int bookmarkedPostCounter = 0; @@ -2041,6 +1988,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } catch (ConfigurationException ce1) { logger.log(Level.SEVERE, "Could not store configuration!", ce1); + } catch (DatabaseException de1) { + logger.log(Level.SEVERE, "Could not save database!", de1); } finally { synchronized (configuration) { storingConfiguration = false; @@ -2125,21 +2074,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, ++soneCounter; } - /* load known posts. */ - postDatabase.loadKnownPosts(configuration, "KnownPosts/"); - - /* load known replies. */ - int replyCounter = 0; - while (true) { - String knownReplyId = configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").getValue(null); - if (knownReplyId == null) { - break; - } - synchronized (knownReplies) { - knownReplies.add(knownReplyId); - } - } - /* load bookmarked posts. */ int bookmarkedPostCounter = 0; while (true) { @@ -2194,7 +2128,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, public void ownIdentityRemoved(OwnIdentityRemovedEvent ownIdentityRemovedEvent) { OwnIdentity ownIdentity = ownIdentityRemovedEvent.ownIdentity(); logger.log(Level.FINEST, String.format("Removing OwnIdentity: %s", ownIdentity)); - trustedIdentities.remove(ownIdentity); + trustedIdentities.removeAll(ownIdentity); } /** @@ -2207,7 +2141,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, public void identityAdded(IdentityAddedEvent identityAddedEvent) { Identity identity = identityAddedEvent.identity(); logger.log(Level.FINEST, String.format("Adding Identity: %s", identity)); - trustedIdentities.get(identityAddedEvent.ownIdentity()).add(identity); + trustedIdentities.put(identityAddedEvent.ownIdentity(), identity); addRemoteSone(identity); } @@ -2244,9 +2178,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, public void identityRemoved(IdentityRemovedEvent identityRemovedEvent) { OwnIdentity ownIdentity = identityRemovedEvent.ownIdentity(); Identity identity = identityRemovedEvent.identity(); - trustedIdentities.get(ownIdentity).remove(identity); + trustedIdentities.remove(ownIdentity, identity); boolean foundIdentity = false; - for (Entry> trustedIdentity : trustedIdentities.entrySet()) { + for (Entry> trustedIdentity : trustedIdentities.asMap().entrySet()) { if (trustedIdentity.getKey().equals(ownIdentity)) { continue; } @@ -2263,17 +2197,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, /* TODO - we don’t have the Sone anymore. should this happen? */ return; } - postDatabase.removePosts(sone.get()); + database.removePosts(sone.get()); for (Post post : sone.get().getPosts()) { eventBus.post(new PostRemovedEvent(post)); } - synchronized (replies) { - synchronized (knownReplies) { - for (PostReply reply : sone.get().getReplies()) { - replies.remove(reply.getId()); - eventBus.post(new PostReplyRemovedEvent(reply)); - } - } + database.removePostReplies(sone.get()); + for (PostReply reply : sone.get().getReplies()) { + eventBus.post(new PostReplyRemovedEvent(reply)); } synchronized (sones) { sones.remove(identity.getId());