X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=08cd1cc75582c57ae2c0c9c1679892c49737ce63;hb=bc9955ab662f53593951cc79cd5505277299a9ba;hp=55e3b65935ce45fc42865a765f783c83d69b7323;hpb=13165bb4eb8d164b05b749e5997dbf64ad209611;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 55e3b65..08cd1cc 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -107,6 +109,9 @@ public class Core implements IdentityListener, UpdateListener {
 	/** The Sone downloader. */
 	private final SoneDownloader soneDownloader;
 
+	/** Sone downloader thread-pool. */
+	private final ExecutorService soneDownloaders = Executors.newFixedThreadPool(10);
+
 	/** The update checker. */
 	private final UpdateChecker updateChecker;
 
@@ -919,7 +924,7 @@ public class Core implements IdentityListener, UpdateListener {
 			remoteSones.put(identity.getId(), sone);
 			soneDownloader.addSone(sone);
 			setSoneStatus(sone, SoneStatus.unknown);
-			new Thread(new Runnable() {
+			soneDownloaders.execute(new Runnable() {
 
 				@Override
 				@SuppressWarnings("synthetic-access")
@@ -927,7 +932,7 @@ public class Core implements IdentityListener, UpdateListener {
 					soneDownloader.fetchSone(sone, sone.getRequestUri());
 				}
 
-			}, "Sone Downloader").start();
+			});
 			return sone;
 		}
 	}
@@ -1173,6 +1178,9 @@ public class Core implements IdentityListener, UpdateListener {
 			return;
 		}
 
+		/* initialize options. */
+		sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption<Boolean>(false));
+
 		/* load Sone. */
 		String sonePrefix = "Sone/" + sone.getId();
 		Long soneTime = configuration.getLongValue(sonePrefix + "/Time").getValue(null);
@@ -1273,7 +1281,6 @@ public class Core implements IdentityListener, UpdateListener {
 		}
 
 		/* load options. */
-		sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption<Boolean>(false));
 		sone.getOptions().getBooleanOption("AutoFollow").set(configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").getValue(null));
 
 		/* if we’re still here, Sone was loaded successfully. */
@@ -1694,6 +1701,7 @@ public class Core implements IdentityListener, UpdateListener {
 			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.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());
 			configuration.getStringValue("Option/TrustComment").setValue(options.getStringOption("TrustComment").getReal());
@@ -1768,6 +1776,7 @@ public class Core implements IdentityListener, UpdateListener {
 
 		}));
 		options.addIntegerOption("PostsPerPage", new DefaultOption<Integer>(10));
+		options.addBooleanOption("RequireFullAccess", new DefaultOption<Boolean>(false));
 		options.addIntegerOption("PositiveTrust", new DefaultOption<Integer>(75));
 		options.addIntegerOption("NegativeTrust", new DefaultOption<Integer>(-25));
 		options.addStringOption("TrustComment", new DefaultOption<String>("Set from Sone Web Interface"));
@@ -1788,6 +1797,7 @@ public class Core implements IdentityListener, UpdateListener {
 
 		options.getIntegerOption("InsertionDelay").set(configuration.getIntValue("Option/InsertionDelay").getValue(null));
 		options.getIntegerOption("PostsPerPage").set(configuration.getIntValue("Option/PostsPerPage").getValue(null));
+		options.getBooleanOption("RequireFullAccess").set(configuration.getBooleanValue("Option/RequireFullAccess").getValue(null));
 		options.getIntegerOption("PositiveTrust").set(configuration.getIntValue("Option/PositiveTrust").getValue(null));
 		options.getIntegerOption("NegativeTrust").set(configuration.getIntValue("Option/NegativeTrust").getValue(null));
 		options.getStringOption("TrustComment").set(configuration.getStringValue("Option/TrustComment").getValue(null));
@@ -2007,6 +2017,18 @@ public class Core implements IdentityListener, UpdateListener {
 		}
 
 		/**
+		 * Validates the given insertion delay.
+		 *
+		 * @param insertionDelay
+		 *            The insertion delay to validate
+		 * @return {@code true} if the given insertion delay was valid, {@code
+		 *         false} otherwise
+		 */
+		public boolean validateInsertionDelay(Integer insertionDelay) {
+			return options.getIntegerOption("InsertionDelay").validate(insertionDelay);
+		}
+
+		/**
 		 * Sets the insertion delay
 		 *
 		 * @param insertionDelay
@@ -2029,6 +2051,18 @@ public class Core implements IdentityListener, UpdateListener {
 		}
 
 		/**
+		 * Validates the number of posts per page.
+		 *
+		 * @param postsPerPage
+		 *            The number of posts per page
+		 * @return {@code true} if the number of posts per page was valid,
+		 *         {@code false} otherwise
+		 */
+		public boolean validatePostsPerPage(Integer postsPerPage) {
+			return options.getIntegerOption("PostsPerPage").validate(postsPerPage);
+		}
+
+		/**
 		 * Sets the number of posts to show per page.
 		 *
 		 * @param postsPerPage
@@ -2041,6 +2075,27 @@ public class Core implements IdentityListener, UpdateListener {
 		}
 
 		/**
+		 * Returns whether Sone requires full access to be even visible.
+		 *
+		 * @return {@code true} if Sone requires full access, {@code false}
+		 *         otherwise
+		 */
+		public boolean isRequireFullAccess() {
+			return options.getBooleanOption("RequireFullAccess").get();
+		}
+
+		/**
+		 * Sets whether Sone requires full access to be even visible.
+		 *
+		 * @param requireFullAccess
+		 *            {@code true} if Sone requires full access, {@code false}
+		 *            otherwise
+		 */
+		public void setRequireFullAccess(Boolean requireFullAccess) {
+			options.getBooleanOption("RequireFullAccess").set(requireFullAccess);
+		}
+
+		/**
 		 * Returns the positive trust.
 		 *
 		 * @return The positive trust
@@ -2050,6 +2105,18 @@ public class Core implements IdentityListener, UpdateListener {
 		}
 
 		/**
+		 * Validates the positive trust.
+		 *
+		 * @param positiveTrust
+		 *            The positive trust to validate
+		 * @return {@code true} if the positive trust was valid, {@code false}
+		 *         otherwise
+		 */
+		public boolean validatePositiveTrust(Integer positiveTrust) {
+			return options.getIntegerOption("PositiveTrust").validate(positiveTrust);
+		}
+
+		/**
 		 * Sets the positive trust.
 		 *
 		 * @param positiveTrust
@@ -2072,6 +2139,18 @@ public class Core implements IdentityListener, UpdateListener {
 		}
 
 		/**
+		 * Validates the negative trust.
+		 *
+		 * @param negativeTrust
+		 *            The negative trust to validate
+		 * @return {@code true} if the negative trust was valid, {@code false}
+		 *         otherwise
+		 */
+		public boolean validateNegativeTrust(Integer negativeTrust) {
+			return options.getIntegerOption("NegativeTrust").validate(negativeTrust);
+		}
+
+		/**
 		 * Sets the negative trust.
 		 *
 		 * @param negativeTrust