X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=c830cf4f5b847a228477d123ea217502298889e2;hb=a5b5a35ac7d6d391fe43fda16d3a512a0927cca4;hp=807b1f32ac82f7ac66becaa601fedcccb63bb78f;hpb=66b1ea22fc5b2685ab8d649f270c9c4c4f86e90a;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 807b1f3..c830cf4 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -31,6 +31,7 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.core.Options.DefaultOption;
 import net.pterodactylus.sone.core.Options.Option;
 import net.pterodactylus.sone.core.Options.OptionWatcher;
+import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Profile;
@@ -45,6 +46,7 @@ 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.version.Version;
 import freenet.keys.FreenetURI;
 
 /**
@@ -52,7 +54,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}.
@@ -86,6 +88,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;
 
@@ -95,6 +100,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;
 
@@ -144,6 +152,9 @@ public class Core implements IdentityListener {
 	/** All known replies. */
 	private Set<String> knownReplies = new HashSet<String>();
 
+	/** All known albums. */
+	private Map<String, Album> albums = new HashMap<String, Album>();
+
 	/**
 	 * Creates a new core.
 	 *
@@ -159,6 +170,7 @@ public class Core implements IdentityListener {
 		this.freenetInterface = freenetInterface;
 		this.identityManager = identityManager;
 		this.soneDownloader = new SoneDownloader(this, freenetInterface);
+		this.updateChecker = new UpdateChecker(freenetInterface);
 	}
 
 	//
@@ -230,6 +242,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
@@ -696,6 +717,41 @@ public class Core implements IdentityListener {
 		return sones;
 	}
 
+	/**
+	 * Returns the album with the given ID, creating a new album if no album
+	 * with the given ID can be found.
+	 *
+	 * @param albumId
+	 *            The ID of the album
+	 * @return The album with the given ID
+	 */
+	public Album getAlbum(String albumId) {
+		return getAlbum(albumId, true);
+	}
+
+	/**
+	 * Returns the album with the given ID, optionally creating a new album if
+	 * an album with the given ID can not be found.
+	 *
+	 * @param albumId
+	 *            The ID of the album
+	 * @param create
+	 *            {@code true} to create a new album if none exists for the
+	 *            given ID
+	 * @return The album with the given ID, or {@code null} if no album with the
+	 *         given ID exists and {@code create} is {@code false}
+	 */
+	public Album getAlbum(String albumId, boolean create) {
+		synchronized (albums) {
+			Album album = albums.get(albumId);
+			if (create && (album == null)) {
+				album = new Album(albumId);
+				albums.put(albumId, album);
+			}
+			return album;
+		}
+	}
+
 	//
 	// ACTIONS
 	//
@@ -1397,6 +1453,8 @@ public class Core implements IdentityListener {
 	 */
 	public void start() {
 		loadConfiguration();
+		updateChecker.addUpdateListener(this);
+		updateChecker.start();
 	}
 
 	/**
@@ -1408,6 +1466,8 @@ public class Core implements IdentityListener {
 				soneInserter.stop();
 			}
 		}
+		updateChecker.stop();
+		updateChecker.removeUpdateListener(this);
 		soneDownloader.stop();
 		saveConfiguration();
 		stopped = true;
@@ -1416,9 +1476,18 @@ public class Core implements IdentityListener {
 	/**
 	 * Saves the current options.
 	 */
-	public synchronized void saveConfiguration() {
+	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.getBooleanValue("Option/SoneRescueMode").setValue(options.getBooleanOption("SoneRescueMode").getReal());
 			configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal());
@@ -1456,6 +1525,10 @@ public class Core implements IdentityListener {
 
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.SEVERE, "Could not store configuration!", ce1);
+		} finally {
+			synchronized (configuration) {
+				storingConfiguration = false;
+			}
 		}
 	}
 
@@ -1606,4 +1679,16 @@ public class Core implements IdentityListener {
 		/* TODO */
 	}
 
+	//
+	// INTERFACE UpdateListener
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void updateFound(Version version, long releaseTime) {
+		coreListenerManager.fireUpdateFound(version, releaseTime);
+	}
+
 }