X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=ea36aad76bf88c22ff6376495271d050c5133f61;hp=7ecf0fa4e4b531dffb33eddbeb8bcf64e76cf8ab;hb=bb2c8cb2d47a77bcef2d299ad4bf8e16f22a6198;hpb=3c7c28dad396ea710bec838550ffd54718d7999a

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 7ecf0fa..ea36aad 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -49,7 +49,6 @@ import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.sone.freenet.wot.Trust;
 import net.pterodactylus.sone.freenet.wot.WebOfTrustException;
 import net.pterodactylus.sone.main.SonePlugin;
-import net.pterodactylus.util.collection.Pair;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
 import net.pterodactylus.util.logging.Logging;
@@ -60,7 +59,6 @@ import net.pterodactylus.util.validation.IntegerRangeValidator;
 import net.pterodactylus.util.validation.OrValidator;
 import net.pterodactylus.util.validation.Validation;
 import net.pterodactylus.util.version.Version;
-import freenet.client.FetchResult;
 import freenet.keys.FreenetURI;
 
 /**
@@ -127,6 +125,7 @@ public class Core implements IdentityListener, UpdateListener, SoneProvider, Pos
 	private volatile FcpInterface fcpInterface;
 
 	/** Whether the core has been stopped. */
+	@SuppressWarnings("unused")
 	private volatile boolean stopped;
 
 	/** The Sones’ statuses. */
@@ -141,6 +140,10 @@ public class Core implements IdentityListener, UpdateListener, SoneProvider, Pos
 	/* synchronize access on this on localSones. */
 	private final Map<Sone, SoneInserter> soneInserters = new HashMap<Sone, SoneInserter>();
 
+	/** Sone rescuers. */
+	/* synchronize access on this on localSones. */
+	private final Map<Sone, SoneRescuer> soneRescuers = new HashMap<Sone, SoneRescuer>();
+
 	/** All local Sones. */
 	/* synchronize access on this on itself. */
 	private Map<String, Sone> localSones = new HashMap<String, Sone>();
@@ -308,6 +311,26 @@ public class Core implements IdentityListener, UpdateListener, SoneProvider, Pos
 	}
 
 	/**
+	 * Returns the Sone rescuer for the given local Sone.
+	 *
+	 * @param sone
+	 *            The local Sone to get the rescuer for
+	 * @return The Sone rescuer for the given Sone
+	 */
+	public SoneRescuer getSoneRescuer(Sone sone) {
+		Validation.begin().isNotNull("Sone", sone).check().is("Local Sone", isLocalSone(sone)).check();
+		synchronized (localSones) {
+			SoneRescuer soneRescuer = soneRescuers.get(sone);
+			if (soneRescuer == null) {
+				soneRescuer = new SoneRescuer(this, soneDownloader, sone);
+				soneRescuers.put(sone, soneRescuer);
+				soneRescuer.start();
+			}
+			return soneRescuer;
+		}
+	}
+
+	/**
 	 * Returns whether the given Sone is currently locked.
 	 *
 	 * @param sone
@@ -862,41 +885,7 @@ public class Core implements IdentityListener, UpdateListener, SoneProvider, Pos
 			soneInserters.put(sone, soneInserter);
 			setSoneStatus(sone, SoneStatus.idle);
 			loadSone(sone);
-			if (!preferences.isSoneRescueMode()) {
-				soneInserter.start();
-			}
-			new Thread(new Runnable() {
-
-				@Override
-				@SuppressWarnings("synthetic-access")
-				public void run() {
-					if (!preferences.isSoneRescueMode()) {
-						return;
-					}
-					logger.log(Level.INFO, "Trying to restore Sone from Freenet…");
-					coreListenerManager.fireRescuingSone(sone);
-					lockSone(sone);
-					long edition = sone.getLatestEdition();
-					/* find the latest edition the node knows about. */
-					Pair<FreenetURI, FetchResult> currentUri = freenetInterface.fetchUri(sone.getRequestUri());
-					if (currentUri != null) {
-						long currentEdition = currentUri.getLeft().getEdition();
-						if (currentEdition > edition) {
-							edition = currentEdition;
-						}
-					}
-					while (!stopped && (edition >= 0) && preferences.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…");
-					saveSone(sone);
-					coreListenerManager.fireRescuedSone(sone);
-					soneInserter.start();
-				}
-
-			}, "Sone Downloader").start();
+			soneInserter.start();
 			return sone;
 		}
 	}
@@ -1064,14 +1053,28 @@ public class Core implements IdentityListener, UpdateListener, SoneProvider, Pos
 	}
 
 	/**
-	 * Updates the stores Sone with the given Sone.
+	 * Updates the stored Sone with the given Sone.
 	 *
 	 * @param sone
 	 *            The updated Sone
 	 */
 	public void updateSone(Sone sone) {
+		updateSone(sone, false);
+	}
+
+	/**
+	 * Updates the stored Sone with the given Sone. If {@code soneRescueMode} is
+	 * {@code true}, an older Sone than the current Sone can be given to restore
+	 * an old state.
+	 *
+	 * @param sone
+	 *            The Sone to update
+	 * @param soneRescueMode
+	 *            {@code true} if the stored Sone should be updated regardless
+	 *            of the age of the given Sone
+	 */
+	public void updateSone(Sone sone, boolean soneRescueMode) {
 		if (hasSone(sone.getId())) {
-			boolean soneRescueMode = isLocalSone(sone) && preferences.isSoneRescueMode();
 			Sone storedSone = getSone(sone.getId());
 			if (!soneRescueMode && !(sone.getTime() > storedSone.getTime())) {
 				logger.log(Level.FINE, "Downloaded Sone %s is not newer than stored Sone %s.", new Object[] { sone, storedSone });
@@ -2371,29 +2374,6 @@ public class Core implements IdentityListener, UpdateListener, SoneProvider, Pos
 		}
 
 		/**
-		 * Returns whether the rescue mode is active.
-		 *
-		 * @return {@code true} if the rescue mode is active, {@code false}
-		 *         otherwise
-		 */
-		public boolean isSoneRescueMode() {
-			return options.getBooleanOption("SoneRescueMode").get();
-		}
-
-		/**
-		 * Sets whether the rescue mode is active.
-		 *
-		 * @param soneRescueMode
-		 *            {@code true} if the rescue mode is active, {@code false}
-		 *            otherwise
-		 * @return This preferences
-		 */
-		public Preferences setSoneRescueMode(Boolean soneRescueMode) {
-			options.getBooleanOption("SoneRescueMode").set(soneRescueMode);
-			return this;
-		}
-
-		/**
 		 * Returns whether Sone should clear its settings on the next restart.
 		 * In order to be effective, {@link #isReallyClearOnNextRestart()} needs
 		 * to return {@code true} as well!