X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=fb687f871ae9deb6b4770e6e6a2e60d666f2b2b9;hb=6ca0a375e32d42c68b7c84222d66a049dff192f3;hp=3c99eef26708a6b027a0277c886fc13c4a562e72;hpb=47ed7eaf00c35889781831d33d04e9f91c9ad266;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 3c99eef..fb687f8 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -49,16 +49,16 @@ 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;
 import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.thread.Ticker;
+import net.pterodactylus.util.validation.EqualityValidator;
 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;
 
 /**
@@ -66,7 +66,7 @@ import freenet.keys.FreenetURI;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Core implements IdentityListener, UpdateListener, SoneProvider, PostProvider {
+public class Core implements IdentityListener, UpdateListener, SoneProvider, PostProvider, SoneInsertListener {
 
 	/**
 	 * Enumeration for the possible states of a {@link Sone}.
@@ -125,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. */
@@ -139,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>();
@@ -306,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
@@ -857,44 +882,11 @@ public class Core implements IdentityListener, UpdateListener, SoneProvider, Pos
 			/* TODO - load posts ’n stuff */
 			localSones.put(ownIdentity.getId(), sone);
 			final SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
+			soneInserter.addSoneInsertListener(this);
 			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;
 		}
 	}
@@ -1062,14 +1054,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 });
@@ -1166,7 +1172,9 @@ public class Core implements IdentityListener, UpdateListener, SoneProvider, Pos
 				return;
 			}
 			localSones.remove(sone.getId());
-			soneInserters.remove(sone).stop();
+			SoneInserter soneInserter = soneInserters.remove(sone);
+			soneInserter.removeSoneInsertListener(this);
+			soneInserter.stop();
 		}
 		try {
 			((OwnIdentity) sone.getIdentity()).removeContext("Sone");
@@ -1727,6 +1735,7 @@ public class Core implements IdentityListener, UpdateListener, SoneProvider, Pos
 	public void stop() {
 		synchronized (localSones) {
 			for (SoneInserter soneInserter : soneInserters.values()) {
+				soneInserter.removeSoneInsertListener(this);
 				soneInserter.stop();
 			}
 			for (Sone localSone : localSones.values()) {
@@ -1757,6 +1766,7 @@ public class Core implements IdentityListener, UpdateListener, SoneProvider, Pos
 			configuration.getIntValue("Option/ConfigurationVersion").setValue(0);
 			configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());
 			configuration.getIntValue("Option/PostsPerPage").setValue(options.getIntegerOption("PostsPerPage").getReal());
+			configuration.getIntValue("Option/CharactersPerPost").setValue(options.getIntegerOption("CharactersPerPost").getReal());
 			configuration.getBooleanValue("Option/RequireFullAccess").setValue(options.getBooleanOption("RequireFullAccess").getReal());
 			configuration.getIntValue("Option/PositiveTrust").setValue(options.getIntegerOption("PositiveTrust").getReal());
 			configuration.getIntValue("Option/NegativeTrust").setValue(options.getIntegerOption("NegativeTrust").getReal());
@@ -1834,6 +1844,7 @@ public class Core implements IdentityListener, UpdateListener, SoneProvider, Pos
 
 		}));
 		options.addIntegerOption("PostsPerPage", new DefaultOption<Integer>(10, new IntegerRangeValidator(1, Integer.MAX_VALUE)));
+		options.addIntegerOption("CharactersPerPost", new DefaultOption<Integer>(200, new OrValidator<Integer>(new IntegerRangeValidator(50, Integer.MAX_VALUE), new EqualityValidator<Integer>(-1))));
 		options.addBooleanOption("RequireFullAccess", new DefaultOption<Boolean>(false));
 		options.addIntegerOption("PositiveTrust", new DefaultOption<Integer>(75, new IntegerRangeValidator(0, 100)));
 		options.addIntegerOption("NegativeTrust", new DefaultOption<Integer>(-25, new IntegerRangeValidator(-100, 100)));
@@ -1872,6 +1883,7 @@ public class Core implements IdentityListener, UpdateListener, SoneProvider, Pos
 
 		loadConfigurationValue("InsertionDelay");
 		loadConfigurationValue("PostsPerPage");
+		loadConfigurationValue("CharactersPerPost");
 		options.getBooleanOption("RequireFullAccess").set(configuration.getBooleanValue("Option/RequireFullAccess").getValue(null));
 		loadConfigurationValue("PositiveTrust");
 		loadConfigurationValue("NegativeTrust");
@@ -2079,6 +2091,33 @@ public class Core implements IdentityListener, UpdateListener, SoneProvider, Pos
 		coreListenerManager.fireUpdateFound(version, releaseTime, latestEdition);
 	}
 
+	//
+	// SONEINSERTLISTENER METHODS
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void insertStarted(Sone sone) {
+		coreListenerManager.fireSoneInserting(sone);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void insertFinished(Sone sone, long insertDuration) {
+		coreListenerManager.fireSoneInserted(sone, insertDuration);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void insertAborted(Sone sone, Throwable cause) {
+		coreListenerManager.fireSoneInsertAborted(sone, cause);
+	}
+
 	/**
 	 * Convenience interface for external classes that want to access the core’s
 	 * configuration.
@@ -2168,6 +2207,41 @@ public class Core implements IdentityListener, UpdateListener, SoneProvider, Pos
 		}
 
 		/**
+		 * Returns the number of characters per post, or <code>-1</code> if the
+		 * posts should not be cut off.
+		 *
+		 * @return The numbers of characters per post
+		 */
+		public int getCharactersPerPost() {
+			return options.getIntegerOption("CharactersPerPost").get();
+		}
+
+		/**
+		 * Validates the number of characters per post.
+		 *
+		 * @param charactersPerPost
+		 *            The number of characters per post
+		 * @return {@code true} if the number of characters per post was valid,
+		 *         {@code false} otherwise
+		 */
+		public boolean validateCharactersPerPost(Integer charactersPerPost) {
+			return options.getIntegerOption("CharactersPerPost").validate(charactersPerPost);
+		}
+
+		/**
+		 * Sets the number of characters per post.
+		 *
+		 * @param charactersPerPost
+		 *            The number of characters per post, or <code>-1</code> to
+		 *            not cut off the posts
+		 * @return This preferences objects
+		 */
+		public Preferences setCharactersPerPost(Integer charactersPerPost) {
+			options.getIntegerOption("CharactersPerPost").set(charactersPerPost);
+			return this;
+		}
+
+		/**
 		 * Returns whether Sone requires full access to be even visible.
 		 *
 		 * @return {@code true} if Sone requires full access, {@code false}
@@ -2331,29 +2405,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!