X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=806ac21a10dfc7238cda765d29c7b75516a58220;hb=e58ffeff69ff27c1174114e882cc9eab56b3bf8e;hp=1bf66479822563deeb3708c5a55138ad1c24327d;hpb=b9556a5c45d39a82f8f4f94a983ef581d487b50f;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 1bf6647..806ac21 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -102,6 +102,10 @@ public class Core implements IdentityListener { /* synchronize access on itself. */ private final Map soneStatuses = new HashMap(); + /** Locked local Sones. */ + /* synchronize on itself. */ + private final Set lockedSones = new HashSet(); + /** Sone inserters. */ /* synchronize access on this on localSones. */ private final Map soneInserters = new HashMap(); @@ -195,6 +199,16 @@ public class Core implements IdentityListener { } /** + * Returns whether the “Sone rescue mode” is currently activated. + * + * @return {@code true} if the “Sone rescue mode” is currently activated, + * {@code false} if it is not + */ + public boolean isSoneRescueMode() { + return options.getBooleanOption("SoneRescueMode").get(); + } + + /** * Returns the identity manager used by the core. * * @return The identity manager @@ -231,6 +245,19 @@ public class Core implements IdentityListener { } /** + * Returns whether the given Sone is currently locked. + * + * @param sone + * The sone to check + * @return {@code true} if the Sone is locked, {@code false} if it is not + */ + public boolean isLocked(Sone sone) { + synchronized (lockedSones) { + return lockedSones.contains(sone); + } + } + + /** * Returns all Sones, remote and local. * * @return All Sones @@ -595,6 +622,33 @@ public class Core implements IdentityListener { // /** + * Locks the given Sone. A locked Sone will not be inserted by + * {@link SoneInserter} until it is {@link #unlockSone(Sone) unlocked} + * again. + * + * @param sone + * The sone to lock + */ + public void lockSone(Sone sone) { + synchronized (lockedSones) { + lockedSones.add(sone); + } + } + + /** + * Unlocks the given Sone. + * + * @see #lockSone(Sone) + * @param sone + * The sone to unlock + */ + public void unlockSone(Sone sone) { + synchronized (lockedSones) { + lockedSones.remove(sone); + } + } + + /** * Adds a local Sone from the given ID which has to be the ID of an own * identity. * @@ -641,17 +695,34 @@ public class Core implements IdentityListener { 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); + final SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone); soneInserters.put(sone, soneInserter); setSoneStatus(sone, SoneStatus.idle); loadSone(sone); - soneInserter.start(); + if (!isSoneRescueMode()) { + soneInserter.start(); + } new Thread(new Runnable() { @Override @SuppressWarnings("synthetic-access") public void run() { - soneDownloader.fetchSone(sone); + if (!isSoneRescueMode()) { + soneDownloader.fetchSone(sone); + 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()) { + logger.log(Level.FINE, "Downloading edition " + edition + "…"); + soneDownloader.fetchSone(sone, sone.getRequestUri().setKeyType("SSK").setDocName("Sone-" + edition)); + --edition; + } + logger.log(Level.INFO, "Finished restoring Sone from Freenet, starting Inserter…"); + coreListenerManager.fireRescuedSone(sone); + soneInserter.start(); } }, "Sone Downloader").start(); @@ -724,18 +795,22 @@ public class Core implements IdentityListener { */ public void updateSone(Sone sone) { if (hasSone(sone.getId())) { + boolean soneRescueMode = isLocalSone(sone) && isSoneRescueMode(); Sone storedSone = getSone(sone.getId()); - if (!(sone.getTime() > storedSone.getTime())) { + if (!soneRescueMode && !(sone.getTime() > storedSone.getTime())) { logger.log(Level.FINE, "Downloaded Sone %s is not newer than stored Sone %s.", new Object[] { sone, storedSone }); return; } synchronized (posts) { - for (Post post : storedSone.getPosts()) { - posts.remove(post.getId()); + if (!soneRescueMode) { + for (Post post : storedSone.getPosts()) { + posts.remove(post.getId()); + } } synchronized (newPosts) { for (Post post : sone.getPosts()) { if (!storedSone.getPosts().contains(post) && !knownPosts.contains(post.getId())) { + post.setSone(getSone(post.getSone().getId())); newPosts.add(post.getId()); coreListenerManager.fireNewPostFound(post); } @@ -744,8 +819,10 @@ public class Core implements IdentityListener { } } synchronized (replies) { - for (Reply reply : storedSone.getReplies()) { - replies.remove(reply.getId()); + if (!soneRescueMode) { + for (Reply reply : storedSone.getReplies()) { + replies.remove(reply.getId()); + } } synchronized (newReplies) { for (Reply reply : sone.getReplies()) { @@ -761,10 +838,25 @@ public class Core implements IdentityListener { storedSone.setTime(sone.getTime()); storedSone.setClient(sone.getClient()); storedSone.setProfile(sone.getProfile()); - storedSone.setPosts(sone.getPosts()); - storedSone.setReplies(sone.getReplies()); - storedSone.setLikePostIds(sone.getLikedPostIds()); - storedSone.setLikeReplyIds(sone.getLikedReplyIds()); + if (soneRescueMode) { + for (Post post : sone.getPosts()) { + storedSone.addPost(post); + } + for (Reply reply : sone.getReplies()) { + storedSone.addReply(reply); + } + for (String likedPostId : sone.getLikedPostIds()) { + storedSone.addLikedPostId(likedPostId); + } + for (String likedReplyId : sone.getLikedReplyIds()) { + storedSone.addLikedReplyId(likedReplyId); + } + } else { + storedSone.setPosts(sone.getPosts()); + storedSone.setReplies(sone.getReplies()); + storedSone.setLikePostIds(sone.getLikedPostIds()); + storedSone.setLikeReplyIds(sone.getLikedReplyIds()); + } storedSone.setLatestEdition(sone.getRequestUri().getEdition()); } } @@ -1164,6 +1256,7 @@ public class Core implements IdentityListener { } })); + options.addBooleanOption("SoneRescueMode", new DefaultOption(false)); options.addBooleanOption("ClearOnNextRestart", new DefaultOption(false)); options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption(false)); @@ -1179,6 +1272,7 @@ public class Core implements IdentityListener { } options.getIntegerOption("InsertionDelay").set(configuration.getIntValue("Option/InsertionDelay").getValue(null)); + options.getBooleanOption("SoneRescueMode").set(configuration.getBooleanValue("Option/SoneRescueMode").getValue(null)); /* load known Sones. */ int soneCounter = 0; @@ -1225,6 +1319,7 @@ public class Core implements IdentityListener { /* 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());