X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=0382c71be8a66a1d5fa4f5e9ccb2461c913a9239;hb=c4e6a05d7ec117a4bc1605bba59f9ef798ec0b37;hp=616dd04277336b487a23b0fcd1ba423b353cc9eb;hpb=4642e7fb8a7aa173915069d9c66395d5e898b3c5;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 616dd04..0382c71 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -31,6 +31,7 @@ import java.util.logging.Logger; import net.pterodactylus.sone.core.Options.DefaultOption; import net.pterodactylus.sone.core.Options.Option; import net.pterodactylus.sone.core.Options.OptionWatcher; +import net.pterodactylus.sone.data.Client; import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.Profile; import net.pterodactylus.sone.data.Reply; @@ -39,6 +40,7 @@ import net.pterodactylus.sone.freenet.wot.Identity; import net.pterodactylus.sone.freenet.wot.IdentityListener; import net.pterodactylus.sone.freenet.wot.IdentityManager; import net.pterodactylus.sone.freenet.wot.OwnIdentity; +import net.pterodactylus.sone.main.SonePlugin; import net.pterodactylus.util.config.Configuration; import net.pterodactylus.util.config.ConfigurationException; import net.pterodactylus.util.logging.Logging; @@ -116,9 +118,22 @@ public class Core implements IdentityListener { /** All posts. */ private Map posts = new HashMap(); + /** All new posts. */ + private Set newPosts = new HashSet(); + + /** All known posts. */ + /* synchronize access on {@link #newPosts}. */ + private Set knownPosts = new HashSet(); + /** All replies. */ private Map replies = new HashMap(); + /** All new replies. */ + private Set newReplies = new HashSet(); + + /** All known replies. */ + private Set knownReplies = new HashSet(); + /** * Creates a new core. * @@ -288,9 +303,23 @@ public class Core implements IdentityListener { * @return The Sone with the given ID */ public Sone getLocalSone(String id) { + return getLocalSone(id, true); + } + + /** + * Returns the local Sone with the given ID, optionally creating a new Sone. + * + * @param id + * The ID of the Sone + * @param create + * {@code true} to create a new Sone if none exists, + * {@code false} to return null if none exists + * @return The Sone with the given ID, or {@code null} + */ + public Sone getLocalSone(String id, boolean create) { synchronized (localSones) { Sone sone = localSones.get(id); - if (sone == null) { + if ((sone == null) && create) { sone = new Sone(id); localSones.put(id, sone); } @@ -387,6 +416,18 @@ public class Core implements IdentityListener { } /** + * Returns whether the given Sone has been modified. + * + * @param sone + * The Sone to check for modifications + * @return {@code true} if a modification has been detected in the Sone, + * {@code false} otherwise + */ + public boolean isModifiedSone(Sone sone) { + return (soneInserters.containsKey(sone)) ? soneInserters.get(sone).isModified() : false; + } + + /** * Returns the post with the given ID. * * @param postId @@ -405,6 +446,23 @@ public class Core implements IdentityListener { } /** + * Returns whether the given post ID is new. After this method returns it is + * marked a known post ID. + * + * @param postId + * The post ID + * @return {@code true} if the post is considered to be new, {@code false} + * otherwise + */ + public boolean isNewPost(String postId) { + synchronized (newPosts) { + boolean isNew = !knownPosts.contains(postId) && newPosts.remove(postId); + knownPosts.add(postId); + return isNew; + } + } + + /** * Returns the reply with the given ID. * * @param replyId @@ -444,6 +502,22 @@ public class Core implements IdentityListener { } /** + * Returns whether the reply with the given ID is new. + * + * @param replyId + * The ID of the reply to check + * @return {@code true} if the reply is considered to be new, {@code false} + * otherwise + */ + public boolean isNewReply(String replyId) { + synchronized (newReplies) { + boolean isNew = !knownReplies.contains(replyId) && newReplies.remove(replyId); + knownReplies.add(replyId); + return isNew; + } + } + + /** * Returns all Sones that have liked the given post. * * @param post @@ -520,18 +594,19 @@ public class Core implements IdentityListener { final Sone sone; try { sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri())); - sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0)); } catch (MalformedURLException mue1) { logger.log(Level.SEVERE, "Could not convert the Identity’s URIs to Freenet URIs: " + ownIdentity.getInsertUri() + ", " + ownIdentity.getRequestUri(), mue1); return null; } + sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0)); + sone.setClient(new Client("Sone", SonePlugin.VERSION.toString())); /* TODO - load posts ’n stuff */ localSones.put(ownIdentity.getId(), sone); SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone); soneInserters.put(sone, soneInserter); - soneInserter.start(); setSoneStatus(sone, SoneStatus.idle); loadSone(sone); + soneInserter.start(); new Thread(new Runnable() { @Override @@ -555,10 +630,6 @@ public class Core implements IdentityListener { public Sone createSone(OwnIdentity ownIdentity) { identityManager.addContext(ownIdentity, "Sone"); Sone sone = addLocalSone(ownIdentity); - synchronized (sone) { - /* mark as modified so that it gets inserted immediately. */ - sone.setModificationCounter(sone.getModificationCounter() + 1); - } return sone; } @@ -607,8 +678,8 @@ public class Core implements IdentityListener { * The updated Sone */ public void updateSone(Sone sone) { - if (isRemoteSone(sone)) { - Sone storedSone = getRemoteSone(sone.getId()); + if (hasSone(sone.getId())) { + Sone storedSone = getSone(sone.getId()); if (!(sone.getTime() > storedSone.getTime())) { logger.log(Level.FINE, "Downloaded Sone %s is not newer than stored Sone %s.", new Object[] { sone, storedSone }); return; @@ -617,16 +688,26 @@ public class Core implements IdentityListener { for (Post post : storedSone.getPosts()) { posts.remove(post.getId()); } - for (Post post : sone.getPosts()) { - posts.put(post.getId(), post); + synchronized (newPosts) { + for (Post post : sone.getPosts()) { + if (!storedSone.getPosts().contains(post) && !knownSones.contains(post.getId())) { + newPosts.add(post.getId()); + } + posts.put(post.getId(), post); + } } } synchronized (replies) { for (Reply reply : storedSone.getReplies()) { replies.remove(reply.getId()); } - for (Reply reply : sone.getReplies()) { - replies.put(reply.getId(), reply); + synchronized (newReplies) { + for (Reply reply : sone.getReplies()) { + if (!storedSone.getReplies().contains(reply) && !knownSones.contains(reply.getId())) { + newReplies.add(reply.getId()); + } + replies.put(reply.getId(), reply); + } } } synchronized (storedSone) { @@ -637,7 +718,6 @@ public class Core implements IdentityListener { storedSone.setLikePostIds(sone.getLikedPostIds()); storedSone.setLikeReplyIds(sone.getLikedReplyIds()); storedSone.setLatestEdition(sone.getRequestUri().getEdition()); - storedSone.setModificationCounter(0); } } } @@ -692,7 +772,7 @@ public class Core implements IdentityListener { logger.log(Level.INFO, "Could not load Sone because no Sone has been saved."); return; } - long soneModificationCounter = configuration.getLongValue(sonePrefix + "/ModificationCounter").getValue((long) 0); + String lastInsertFingerprint = configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").getValue(""); /* load profile. */ Profile profile = new Profile(); @@ -777,13 +857,23 @@ public class Core implements IdentityListener { sone.setLikePostIds(likedPostIds); sone.setLikeReplyIds(likedReplyIds); sone.setFriends(friends); - sone.setModificationCounter(soneModificationCounter); + soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint); } synchronized (newSones) { for (String friend : friends) { knownSones.add(friend); } } + synchronized (newPosts) { + for (Post post : posts) { + knownPosts.add(post.getId()); + } + } + synchronized (newReplies) { + for (Reply reply : replies) { + knownReplies.add(reply.getId()); + } + } } /** @@ -809,7 +899,7 @@ public class Core implements IdentityListener { /* save Sone into configuration. */ String sonePrefix = "Sone/" + sone.getId(); configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime()); - configuration.getLongValue(sonePrefix + "/ModificationCounter").setValue(sone.getModificationCounter()); + configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").setValue(soneInserters.get(sone).getLastInsertFingerprint()); /* save profile. */ Profile profile = sone.getProfile(); @@ -899,6 +989,9 @@ public class Core implements IdentityListener { synchronized (posts) { posts.put(post.getId(), post); } + synchronized (newPosts) { + knownPosts.add(post.getId()); + } sone.addPost(post); saveSone(sone); } @@ -930,9 +1023,10 @@ public class Core implements IdentityListener { * The post that this reply refers to * @param text * The text of the reply + * @return The created reply */ - public void createReply(Sone sone, Post post, String text) { - createReply(sone, post, System.currentTimeMillis(), text); + public Reply createReply(Sone sone, Post post, String text) { + return createReply(sone, post, System.currentTimeMillis(), text); } /** @@ -946,18 +1040,23 @@ public class Core implements IdentityListener { * The time of the reply * @param text * The text of the reply + * @return The created reply */ - public void createReply(Sone sone, Post post, long time, String text) { + public Reply createReply(Sone sone, Post post, long time, String text) { if (!isLocalSone(sone)) { logger.log(Level.FINE, "Tried to create reply for non-local Sone: %s", sone); - return; + return null; } Reply reply = new Reply(sone, post, System.currentTimeMillis(), text); synchronized (replies) { replies.put(reply.getId(), reply); } + synchronized (newReplies) { + knownReplies.add(reply.getId()); + } sone.addReply(reply); saveSone(sone); + return reply; } /** @@ -1043,6 +1142,31 @@ public class Core implements IdentityListener { knownSones.add(knownSoneId); } } + + /* load known posts. */ + int postCounter = 0; + while (true) { + String knownPostId = configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").getValue(null); + if (knownPostId == null) { + break; + } + synchronized (newPosts) { + knownPosts.add(knownPostId); + } + } + + /* load known replies. */ + int replyCounter = 0; + while (true) { + String knownReplyId = configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").getValue(null); + if (knownReplyId == null) { + break; + } + synchronized (newReplies) { + knownReplies.add(knownReplyId); + } + } + } /** @@ -1064,6 +1188,24 @@ public class Core implements IdentityListener { configuration.getStringValue("KnownSone/" + soneCounter + "/ID").setValue(null); } + /* save known posts. */ + int postCounter = 0; + synchronized (newPosts) { + for (String knownPostId : knownPosts) { + configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").setValue(knownPostId); + } + configuration.getStringValue("KnownPosts/" + postCounter + "/ID").setValue(null); + } + + /* save known replies. */ + int replyCounter = 0; + synchronized (newReplies) { + for (String knownReplyId : knownReplies) { + configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").setValue(knownReplyId); + } + configuration.getStringValue("KnownReplies/" + replyCounter + "/ID").setValue(null); + } + } catch (ConfigurationException ce1) { logger.log(Level.SEVERE, "Could not store configuration!", ce1); }