X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=3f2111a6e32dc49b5c142505e7863f7cfdb9e632;hb=9dafc7dd9ac7da59e0b27581ea360f69e6097531;hp=d2c14209863bd4104739b31bb53d466ec6e62e71;hpb=c8f0cd47aecd77c5aa3c6784bebde9cc47815de8;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 d2c1420..3f2111a 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 @@ -495,9 +507,23 @@ public class Core implements IdentityListener { * @return The post, or {@code null} if there is no such post */ public Post getPost(String postId) { + return getPost(postId, true); + } + + /** + * Returns the post with the given ID, optionally creating a new post. + * + * @param postId + * The ID of the post to get + * @param create + * {@code true} it create a new post if no post with the given ID + * exists, {@code false} to return {@code null} + * @return The post, or {@code null} if there is no such post + */ + public Post getPost(String postId, boolean create) { synchronized (posts) { Post post = posts.get(postId); - if (post == null) { + if ((post == null) && create) { post = new Post(postId); posts.put(postId, post); } @@ -712,6 +738,7 @@ public class Core implements IdentityListener { return; } logger.log(Level.INFO, "Trying to restore Sone from Freenet…"); + coreListenerManager.fireRescuingSone(sone); lockSone(sone); long edition = sone.getLatestEdition(); while (!stopped && (edition >= 0) && isSoneRescueMode()) { @@ -720,6 +747,8 @@ public class Core implements IdentityListener { --edition; } logger.log(Level.INFO, "Finished restoring Sone from Freenet, starting Inserter…"); + saveSone(sone); + coreListenerManager.fireRescuedSone(sone); soneInserter.start(); } @@ -807,8 +836,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); } @@ -824,6 +853,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); @@ -833,7 +863,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) { @@ -855,7 +887,7 @@ public class Core implements IdentityListener { storedSone.setLikePostIds(sone.getLikedPostIds()); storedSone.setLikeReplyIds(sone.getLikedReplyIds()); } - storedSone.setLatestEdition(sone.getRequestUri().getEdition()); + storedSone.setLatestEdition(sone.getLatestEdition()); } } } @@ -1103,9 +1135,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); } /** @@ -1117,11 +1150,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) { @@ -1132,6 +1166,7 @@ public class Core implements IdentityListener { } sone.addPost(post); saveSone(sone); + return post; } /** @@ -1168,6 +1203,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 @@ -1217,6 +1268,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() { @@ -1236,6 +1303,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 // @@ -1311,49 +1424,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