X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=096f192746f7f3dd844e8f0198bfdfe7e9049c3c;hb=655472c7aecc8683e127e0930297202ecd195d64;hp=ea491bb48e093917eb5a3ebb0c581a42411b4289;hpb=eaf58e65809b6edae309862f0d1da4ffeb32e626;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 ea491bb..096f192 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -84,7 +84,7 @@ public class Core implements IdentityListener { private final CoreListenerManager coreListenerManager = new CoreListenerManager(this); /** The configuration. */ - private final Configuration configuration; + private Configuration configuration; /** The identity manager. */ private final IdentityManager identityManager; @@ -190,6 +190,18 @@ public class Core implements IdentityListener { // /** + * Sets the configuration to use. This will automatically save the current + * configuration to the given configuration. + * + * @param configuration + * The new configuration to use + */ + public void setConfiguration(Configuration configuration) { + this.configuration = configuration; + saveConfiguration(); + } + + /** * Returns the options used by the core. * * @return The options of the core @@ -529,11 +541,31 @@ public class Core implements IdentityListener { * otherwise */ public boolean isNewPost(String postId) { + return isNewPost(postId, true); + } + + /** + * Returns whether the given post ID is new. If {@code markAsKnown} is + * {@code true} then after this method returns the post ID is marked a known + * post ID. + * + * @param postId + * The post ID + * @param markAsKnown + * {@code true} to mark the post ID as known, {@code false} to + * not to mark it as known + * @return {@code true} if the post is considered to be new, {@code false} + * otherwise + */ + public boolean isNewPost(String postId, boolean markAsKnown) { synchronized (newPosts) { - boolean isNew = !knownPosts.contains(postId) && newPosts.remove(postId); - knownPosts.add(postId); - if (isNew) { - coreListenerManager.fireMarkPostKnown(getPost(postId)); + boolean isNew = !knownPosts.contains(postId) && newPosts.contains(postId); + if (markAsKnown) { + newPosts.remove(postId); + knownPosts.add(postId); + if (isNew) { + coreListenerManager.fireMarkPostKnown(getPost(postId)); + } } return isNew; } @@ -587,11 +619,29 @@ public class Core implements IdentityListener { * otherwise */ public boolean isNewReply(String replyId) { + return isNewReply(replyId, true); + } + + /** + * Returns whether the reply with the given ID is new. + * + * @param replyId + * The ID of the reply to check + * @param markAsKnown + * {@code true} to mark the reply as known, {@code false} to not + * to mark it as known + * @return {@code true} if the reply is considered to be new, {@code false} + * otherwise + */ + public boolean isNewReply(String replyId, boolean markAsKnown) { synchronized (newReplies) { - boolean isNew = !knownReplies.contains(replyId) && newReplies.remove(replyId); - knownReplies.add(replyId); - if (isNew) { - coreListenerManager.fireMarkReplyKnown(getReply(replyId)); + boolean isNew = !knownReplies.contains(replyId) && newReplies.contains(replyId); + if (markAsKnown) { + newReplies.remove(replyId); + knownReplies.add(replyId); + if (isNew) { + coreListenerManager.fireMarkReplyKnown(getReply(replyId)); + } } return isNew; } @@ -735,6 +785,7 @@ public class Core implements IdentityListener { --edition; } logger.log(Level.INFO, "Finished restoring Sone from Freenet, starting Inserter…"); + saveSone(sone); coreListenerManager.fireRescuedSone(sone); soneInserter.start(); } @@ -823,8 +874,8 @@ public class Core implements IdentityListener { } synchronized (newPosts) { for (Post post : sone.getPosts()) { + post.setSone(getSone(post.getSone().getId())); if (!storedSone.getPosts().contains(post) && !knownPosts.contains(post.getId())) { - post.setSone(getSone(post.getSone().getId())); newPosts.add(post.getId()); coreListenerManager.fireNewPostFound(post); } @@ -840,6 +891,7 @@ public class Core implements IdentityListener { } synchronized (newReplies) { for (Reply reply : sone.getReplies()) { + reply.setSone(getSone(reply.getSone().getId())); if (!storedSone.getReplies().contains(reply) && !knownReplies.contains(reply.getId())) { newReplies.add(reply.getId()); coreListenerManager.fireNewReplyFound(reply); @@ -849,7 +901,9 @@ public class Core implements IdentityListener { } } synchronized (storedSone) { - storedSone.setTime(sone.getTime()); + if (!soneRescueMode || (sone.getTime() > storedSone.getTime())) { + storedSone.setTime(sone.getTime()); + } storedSone.setClient(sone.getClient()); storedSone.setProfile(sone.getProfile()); if (soneRescueMode) { @@ -871,7 +925,7 @@ public class Core implements IdentityListener { storedSone.setLikePostIds(sone.getLikedPostIds()); storedSone.setLikeReplyIds(sone.getLikedReplyIds()); } - storedSone.setLatestEdition(sone.getRequestUri().getEdition()); + storedSone.setLatestEdition(sone.getLatestEdition()); } } } @@ -1119,9 +1173,10 @@ public class Core implements IdentityListener { * The Sone that creates the post * @param text * The text of the post + * @return The created post */ - public void createPost(Sone sone, String text) { - createPost(sone, System.currentTimeMillis(), text); + public Post createPost(Sone sone, String text) { + return createPost(sone, System.currentTimeMillis(), text); } /** @@ -1133,11 +1188,12 @@ public class Core implements IdentityListener { * The time of the post * @param text * The text of the post + * @return The created post */ - public void createPost(Sone sone, long time, String text) { + public Post createPost(Sone sone, long time, String text) { if (!isLocalSone(sone)) { logger.log(Level.FINE, "Tried to create post for non-local Sone: %s", sone); - return; + return null; } Post post = new Post(sone, time, text); synchronized (posts) { @@ -1148,6 +1204,7 @@ public class Core implements IdentityListener { } sone.addPost(post); saveSone(sone); + return post; } /** @@ -1184,6 +1241,22 @@ public class Core implements IdentityListener { } /** + * Marks the given post as known, if it is currently a new post (according + * to {@link #isNewPost(String)}). + * + * @param post + * The post to mark as known + */ + public void markPostKnown(Post post) { + synchronized (newPosts) { + if (newPosts.remove(post.getId())) { + knownPosts.add(post.getId()); + coreListenerManager.fireMarkPostKnown(post); + } + } + } + + /** * Creates a new reply. * * @param sone @@ -1233,6 +1306,22 @@ public class Core implements IdentityListener { } /** + * Marks the given reply as known, if it is currently a new reply (according + * to {@link #isNewReply(String)}). + * + * @param reply + * The reply to mark as known + */ + public void markReplyKnown(Reply reply) { + synchronized (newReplies) { + if (newReplies.remove(reply.getId())) { + knownReplies.add(reply.getId()); + coreListenerManager.fireMarkReplyKnown(reply); + } + } + } + + /** * Starts the core. */ public void start() { @@ -1252,6 +1341,52 @@ public class Core implements IdentityListener { stopped = true; } + /** + * Saves the current options. + */ + public void saveConfiguration() { + /* store the options first. */ + try { + configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal()); + configuration.getBooleanValue("Option/SoneRescueMode").setValue(options.getBooleanOption("SoneRescueMode").getReal()); + configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal()); + configuration.getBooleanValue("Option/ReallyClearOnNextRestart").setValue(options.getBooleanOption("ReallyClearOnNextRestart").getReal()); + + /* save known Sones. */ + int soneCounter = 0; + synchronized (newSones) { + for (String knownSoneId : knownSones) { + configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSoneId); + } + 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); + } + + /* now save it. */ + configuration.save(); + + } catch (ConfigurationException ce1) { + logger.log(Level.SEVERE, "Could not store configuration!", ce1); + } + } + // // PRIVATE METHODS // @@ -1327,49 +1462,6 @@ public class Core implements IdentityListener { } /** - * Saves the current options. - */ - private void saveConfiguration() { - /* store the options first. */ - try { - configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal()); - configuration.getBooleanValue("Option/SoneRescueMode").setValue(options.getBooleanOption("SoneRescueMode").getReal()); - configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal()); - configuration.getBooleanValue("Option/ReallyClearOnNextRestart").setValue(options.getBooleanOption("ReallyClearOnNextRestart").getReal()); - - /* save known Sones. */ - int soneCounter = 0; - synchronized (newSones) { - for (String knownSoneId : knownSones) { - configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSoneId); - } - 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); - } - } - - /** * Generate a Sone URI from the given URI and latest edition. * * @param uriString