X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=27e8db86f41900d2b0cc3100ff79e8f9ab97d5b9;hp=9263063598a6dc14e889ba6d117fbeb8745a89a4;hb=f4ea1e1b3526175e255831c975d6eea813589f25;hpb=91724f5f8bd2a4e5425835b7d926ae947adb5fbd

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 9263063..27e8db8 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -34,18 +34,22 @@ import net.pterodactylus.sone.core.Options.OptionWatcher;
 import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Profile;
+import net.pterodactylus.sone.data.Profile.Field;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.freenet.wot.IdentityListener;
 import net.pterodactylus.sone.freenet.wot.IdentityManager;
 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.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.number.Numbers;
+import net.pterodactylus.util.validation.Validation;
+import net.pterodactylus.util.version.Version;
 import freenet.keys.FreenetURI;
 
 /**
@@ -53,7 +57,7 @@ import freenet.keys.FreenetURI;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Core implements IdentityListener {
+public class Core implements IdentityListener, UpdateListener {
 
 	/**
 	 * Enumeration for the possible states of a {@link Sone}.
@@ -87,6 +91,9 @@ public class Core implements IdentityListener {
 	/** The configuration. */
 	private Configuration configuration;
 
+	/** Whether we’re currently saving the configuration. */
+	private boolean storingConfiguration = false;
+
 	/** The identity manager. */
 	private final IdentityManager identityManager;
 
@@ -96,6 +103,9 @@ public class Core implements IdentityListener {
 	/** The Sone downloader. */
 	private final SoneDownloader soneDownloader;
 
+	/** The update checker. */
+	private final UpdateChecker updateChecker;
+
 	/** Whether the core has been stopped. */
 	private volatile boolean stopped;
 
@@ -163,6 +173,7 @@ public class Core implements IdentityListener {
 		this.freenetInterface = freenetInterface;
 		this.identityManager = identityManager;
 		this.soneDownloader = new SoneDownloader(this, freenetInterface);
+		this.updateChecker = new UpdateChecker(freenetInterface);
 	}
 
 	//
@@ -234,6 +245,15 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * Returns the update checker.
+	 *
+	 * @return The update checker
+	 */
+	public UpdateChecker getUpdateChecker() {
+		return updateChecker;
+	}
+
+	/**
 	 * Returns the status of the given Sone.
 	 *
 	 * @param sone
@@ -727,7 +747,9 @@ public class Core implements IdentityListener {
 	 */
 	public void lockSone(Sone sone) {
 		synchronized (lockedSones) {
-			lockedSones.add(sone);
+			if (lockedSones.add(sone)) {
+				coreListenerManager.fireSoneLocked(sone);
+			}
 		}
 	}
 
@@ -740,7 +762,9 @@ public class Core implements IdentityListener {
 	 */
 	public void unlockSone(Sone sone) {
 		synchronized (lockedSones) {
-			lockedSones.remove(sone);
+			if (lockedSones.remove(sone)) {
+				coreListenerManager.fireSoneUnlocked(sone);
+			}
 		}
 	}
 
@@ -890,6 +914,97 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * Retrieves the trust relationship from the origin to the target. If the
+	 * trust relationship can not be retrieved, {@code null} is returned.
+	 *
+	 * @see Identity#getTrust(OwnIdentity)
+	 * @param origin
+	 *            The origin of the trust tree
+	 * @param target
+	 *            The target of the trust
+	 * @return The trust relationship
+	 */
+	public Trust getTrust(Sone origin, Sone target) {
+		if (!isLocalSone(origin)) {
+			logger.log(Level.WARNING, "Tried to get trust from remote Sone: %s", origin);
+			return null;
+		}
+		return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity());
+	}
+
+	/**
+	 * Sets the trust value of the given origin Sone for the target Sone.
+	 *
+	 * @param origin
+	 *            The origin Sone
+	 * @param target
+	 *            The target Sone
+	 * @param trustValue
+	 *            The trust value (from {@code -100} to {@code 100})
+	 */
+	public void setTrust(Sone origin, Sone target, int trustValue) {
+		Validation.begin().isNotNull("Trust Origin", origin).check().isInstanceOf("Trust Origin", origin.getIdentity(), OwnIdentity.class).isNotNull("Trust Target", target).isLessOrEqual("Trust Value", trustValue, 100).isGreaterOrEqual("Trust Value", trustValue, -100).check();
+		try {
+			((OwnIdentity) origin.getIdentity()).setTrust(target.getIdentity(), trustValue, options.getStringOption("TrustComment").get());
+		} catch (WebOfTrustException wote1) {
+			logger.log(Level.WARNING, "Could not set trust for Sone: " + target, wote1);
+		}
+	}
+
+	/**
+	 * Removes any trust assignment for the given target Sone.
+	 *
+	 * @param origin
+	 *            The trust origin
+	 * @param target
+	 *            The trust target
+	 */
+	public void removeTrust(Sone origin, Sone target) {
+		Validation.begin().isNotNull("Trust Origin", origin).isNotNull("Trust Target", target).check().isInstanceOf("Trust Origin Identity", origin.getIdentity(), OwnIdentity.class).check();
+		try {
+			((OwnIdentity) origin.getIdentity()).removeTrust(target.getIdentity());
+		} catch (WebOfTrustException wote1) {
+			logger.log(Level.WARNING, "Could not remove trust for Sone: " + target, wote1);
+		}
+	}
+
+	/**
+	 * Assigns the configured positive trust value for the given target.
+	 *
+	 * @param origin
+	 *            The trust origin
+	 * @param target
+	 *            The trust target
+	 */
+	public void trustSone(Sone origin, Sone target) {
+		setTrust(origin, target, options.getIntegerOption("PositiveTrust").get());
+	}
+
+	/**
+	 * Assigns the configured negative trust value for the given target.
+	 *
+	 * @param origin
+	 *            The trust origin
+	 * @param target
+	 *            The trust target
+	 */
+	public void distrustSone(Sone origin, Sone target) {
+		setTrust(origin, target, options.getIntegerOption("NegativeTrust").get());
+	}
+
+	/**
+	 * Removes the trust assignment for the given target.
+	 *
+	 * @param origin
+	 *            The trust origin
+	 * @param target
+	 *            The trust target
+	 */
+	public void untrustSone(Sone origin, Sone target) {
+		removeTrust(origin, target);
+	}
+
+	/**
 	 * Updates the stores Sone with the given Sone.
 	 *
 	 * @param sone
@@ -1038,6 +1153,17 @@ public class Core implements IdentityListener {
 		profile.setBirthMonth(configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").getValue(null));
 		profile.setBirthYear(configuration.getIntValue(sonePrefix + "/Profile/BirthYear").getValue(null));
 
+		/* load profile fields. */
+		while (true) {
+			String fieldPrefix = sonePrefix + "/Profile/Fields/" + profile.getFields().size();
+			String fieldName = configuration.getStringValue(fieldPrefix + "/Name").getValue(null);
+			if (fieldName == null) {
+				break;
+			}
+			String fieldValue = configuration.getStringValue(fieldPrefix + "/Value").getValue("");
+			profile.addField(fieldName).setValue(fieldValue);
+		}
+
 		/* load posts. */
 		Set<Post> posts = new HashSet<Post>();
 		while (true) {
@@ -1143,7 +1269,7 @@ public class Core implements IdentityListener {
 	 * @param sone
 	 *            The Sone to save
 	 */
-	public void saveSone(Sone sone) {
+	public synchronized void saveSone(Sone sone) {
 		if (!isLocalSone(sone)) {
 			logger.log(Level.FINE, "Tried to save non-local Sone: %s", sone);
 			return;
@@ -1171,6 +1297,15 @@ public class Core implements IdentityListener {
 			configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").setValue(profile.getBirthMonth());
 			configuration.getIntValue(sonePrefix + "/Profile/BirthYear").setValue(profile.getBirthYear());
 
+			/* save profile fields. */
+			int fieldCounter = 0;
+			for (Field profileField : profile.getFields()) {
+				String fieldPrefix = sonePrefix + "/Profile/Fields/" + fieldCounter++;
+				configuration.getStringValue(fieldPrefix + "/Name").setValue(profileField.getName());
+				configuration.getStringValue(fieldPrefix + "/Value").setValue(profileField.getValue());
+			}
+			configuration.getStringValue(sonePrefix + "/Profile/Fields/" + fieldCounter + "/Name").setValue(null);
+
 			/* save posts. */
 			int postCounter = 0;
 			for (Post post : sone.getPosts()) {
@@ -1214,6 +1349,7 @@ public class Core implements IdentityListener {
 			}
 			configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
 
+			configuration.save();
 			logger.log(Level.INFO, "Sone %s saved.", sone);
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1);
@@ -1330,6 +1466,7 @@ public class Core implements IdentityListener {
 			if (newPosts.remove(post.getId())) {
 				knownPosts.add(post.getId());
 				coreListenerManager.fireMarkPostKnown(post);
+				saveConfiguration();
 			}
 		}
 	}
@@ -1410,6 +1547,7 @@ public class Core implements IdentityListener {
 			if (newReplies.remove(reply.getId())) {
 				knownReplies.add(reply.getId());
 				coreListenerManager.fireMarkReplyKnown(reply);
+				saveConfiguration();
 			}
 		}
 	}
@@ -1419,6 +1557,8 @@ public class Core implements IdentityListener {
 	 */
 	public void start() {
 		loadConfiguration();
+		updateChecker.addUpdateListener(this);
+		updateChecker.start();
 	}
 
 	/**
@@ -1430,6 +1570,9 @@ public class Core implements IdentityListener {
 				soneInserter.stop();
 			}
 		}
+		updateChecker.stop();
+		updateChecker.removeUpdateListener(this);
+		soneDownloader.stop();
 		saveConfiguration();
 		stopped = true;
 	}
@@ -1438,9 +1581,21 @@ public class Core implements IdentityListener {
 	 * Saves the current options.
 	 */
 	public void saveConfiguration() {
+		synchronized (configuration) {
+			if (storingConfiguration) {
+				logger.log(Level.FINE, "Already storing configuration…");
+				return;
+			}
+			storingConfiguration = true;
+		}
+
 		/* store the options first. */
 		try {
+			configuration.getIntValue("Option/ConfigurationVersion").setValue(0);
 			configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").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());
 			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());
@@ -1477,6 +1632,10 @@ public class Core implements IdentityListener {
 
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.SEVERE, "Could not store configuration!", ce1);
+		} finally {
+			synchronized (configuration) {
+				storingConfiguration = false;
+			}
 		}
 	}
 
@@ -1498,6 +1657,9 @@ public class Core implements IdentityListener {
 			}
 
 		}));
+		options.addIntegerOption("PositiveTrust", new DefaultOption<Integer>(75));
+		options.addIntegerOption("NegativeTrust", new DefaultOption<Integer>(-100));
+		options.addStringOption("TrustComment", new DefaultOption<String>("Set from Sone Web Interface"));
 		options.addBooleanOption("SoneRescueMode", new DefaultOption<Boolean>(false));
 		options.addBooleanOption("ClearOnNextRestart", new DefaultOption<Boolean>(false));
 		options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption<Boolean>(false));
@@ -1514,6 +1676,9 @@ public class Core implements IdentityListener {
 		}
 
 		options.getIntegerOption("InsertionDelay").set(configuration.getIntValue("Option/InsertionDelay").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));
 		options.getBooleanOption("SoneRescueMode").set(configuration.getBooleanValue("Option/SoneRescueMode").getValue(null));
 
 		/* load known Sones. */
@@ -1617,6 +1782,7 @@ public class Core implements IdentityListener {
 			@SuppressWarnings("synthetic-access")
 			public void run() {
 				Sone sone = getRemoteSone(identity.getId());
+				sone.setIdentity(identity);
 				soneDownloader.fetchSone(sone);
 			}
 		}).start();
@@ -1630,4 +1796,16 @@ public class Core implements IdentityListener {
 		trustedIdentities.get(ownIdentity).remove(identity);
 	}
 
+	//
+	// INTERFACE UpdateListener
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void updateFound(Version version, long releaseTime) {
+		coreListenerManager.fireUpdateFound(version, releaseTime);
+	}
+
 }