X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=1a929013961b1ae71d94db2526bc4d85248cb255;hb=9a872c95a624a35552750c7993d03a69ba83f20c;hp=5d176ce630eb353ca99b49ec82f96ea1568efdcc;hpb=a4a36be82ab54c924a6c9cf6b01a7fef3f2e9124;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 5d176ce..1a92901 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -86,6 +86,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;
 
@@ -710,7 +713,9 @@ public class Core implements IdentityListener {
 	 */
 	public void lockSone(Sone sone) {
 		synchronized (lockedSones) {
-			lockedSones.add(sone);
+			if (lockedSones.add(sone)) {
+				coreListenerManager.fireSoneLocked(sone);
+			}
 		}
 	}
 
@@ -723,7 +728,9 @@ public class Core implements IdentityListener {
 	 */
 	public void unlockSone(Sone sone) {
 		synchronized (lockedSones) {
-			lockedSones.remove(sone);
+			if (lockedSones.remove(sone)) {
+				coreListenerManager.fireSoneUnlocked(sone);
+			}
 		}
 	}
 
@@ -886,7 +893,7 @@ public class Core implements IdentityListener {
 					for (Post post : storedSone.getPosts()) {
 						posts.remove(post.getId());
 						if (!sone.getPosts().contains(post)) {
-							markPostKnown(post);
+							coreListenerManager.firePostRemoved(post);
 						}
 					}
 				}
@@ -906,7 +913,7 @@ public class Core implements IdentityListener {
 					for (Reply reply : storedSone.getReplies()) {
 						replies.remove(reply.getId());
 						if (!sone.getReplies().contains(reply)) {
-							markReplyKnown(reply);
+							coreListenerManager.fireReplyRemoved(reply);
 						}
 					}
 				}
@@ -1117,7 +1124,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;
@@ -1187,6 +1194,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);
@@ -1301,6 +1309,7 @@ public class Core implements IdentityListener {
 			if (newPosts.remove(post.getId())) {
 				knownPosts.add(post.getId());
 				coreListenerManager.fireMarkPostKnown(post);
+				saveConfiguration();
 			}
 		}
 	}
@@ -1381,6 +1390,7 @@ public class Core implements IdentityListener {
 			if (newReplies.remove(reply.getId())) {
 				knownReplies.add(reply.getId());
 				coreListenerManager.fireMarkReplyKnown(reply);
+				saveConfiguration();
 			}
 		}
 	}
@@ -1401,6 +1411,7 @@ public class Core implements IdentityListener {
 				soneInserter.stop();
 			}
 		}
+		soneDownloader.stop();
 		saveConfiguration();
 		stopped = true;
 	}
@@ -1409,6 +1420,14 @@ 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/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());
@@ -1448,6 +1467,10 @@ public class Core implements IdentityListener {
 
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.SEVERE, "Could not store configuration!", ce1);
+		} finally {
+			synchronized (configuration) {
+				storingConfiguration = false;
+			}
 		}
 	}