X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=68134933912d4fdb4be9b397be2b08c7484de0b9;hb=32cba82f14855a61174221c010bdcad42c336694;hp=895f57065245c61cb140af9ba64fe187613ef1b3;hpb=c48a672defca02eeda19debeb99ef25bd864e696;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 895f570..6813493 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -31,7 +31,9 @@ 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.Image;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Reply;
@@ -45,6 +47,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 +55,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 +89,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 +101,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 +153,12 @@ 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>();
+
+	/** All known images. */
+	private Map<String, Image> images = new HashMap<String, Image>();
+
 	/**
 	 * Creates a new core.
 	 *
@@ -159,6 +174,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 +246,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 +721,75 @@ 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;
+		}
+	}
+
+	/**
+	 * Returns the image with the given ID, creating it if necessary.
+	 *
+	 * @param imageId
+	 *            The ID of the image
+	 * @return The image with the given ID
+	 */
+	public Image getImage(String imageId) {
+		return getImage(imageId, true);
+	}
+
+	/**
+	 * Returns the image with the given ID, optionally creating it if it does
+	 * not exist.
+	 *
+	 * @param imageId
+	 *            The ID of the image
+	 * @param create
+	 *            {@code true} to create an image if none exists with the given
+	 *            ID
+	 * @return The image with the given ID, or {@code null} if none exists and
+	 *         none was created
+	 */
+	public Image getImage(String imageId, boolean create) {
+		synchronized (images) {
+			Image image = images.get(imageId);
+			if (create && (image == null)) {
+				image = new Image(imageId);
+				images.put(imageId, image);
+			}
+			return image;
+		}
+	}
+
 	//
 	// ACTIONS
 	//
@@ -710,7 +804,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 +819,9 @@ public class Core implements IdentityListener {
 	 */
 	public void unlockSone(Sone sone) {
 		synchronized (lockedSones) {
-			lockedSones.remove(sone);
+			if (lockedSones.remove(sone)) {
+				coreListenerManager.fireSoneUnlocked(sone);
+			}
 		}
 	}
 
@@ -1117,7 +1215,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;
@@ -1302,6 +1400,7 @@ public class Core implements IdentityListener {
 			if (newPosts.remove(post.getId())) {
 				knownPosts.add(post.getId());
 				coreListenerManager.fireMarkPostKnown(post);
+				saveConfiguration();
 			}
 		}
 	}
@@ -1382,15 +1481,52 @@ public class Core implements IdentityListener {
 			if (newReplies.remove(reply.getId())) {
 				knownReplies.add(reply.getId());
 				coreListenerManager.fireMarkReplyKnown(reply);
+				saveConfiguration();
 			}
 		}
 	}
 
 	/**
+	 * Creates a new top-level album for the given Sone.
+	 *
+	 * @param sone
+	 *            The Sone to create the album for
+	 * @return The new album
+	 */
+	public Album createAlbum(Sone sone) {
+		return createAlbum(sone, null);
+	}
+
+	/**
+	 * Creates a new album for the given Sone.
+	 *
+	 * @param sone
+	 *            The Sone to create the album for
+	 * @param parent
+	 *            The parent of the album (may be {@code null} to create a
+	 *            top-level album)
+	 * @return The new album
+	 */
+	public Album createAlbum(Sone sone, Album parent) {
+		Album album = new Album();
+		synchronized (albums) {
+			albums.put(album.getId(), album);
+		}
+		album.setSone(sone);
+		if (parent != null) {
+			parent.addAlbum(album);
+		}
+		sone.addAlbum(album);
+		return album;
+	}
+
+	/**
 	 * Starts the core.
 	 */
 	public void start() {
 		loadConfiguration();
+		updateChecker.addUpdateListener(this);
+		updateChecker.start();
 	}
 
 	/**
@@ -1402,6 +1538,9 @@ public class Core implements IdentityListener {
 				soneInserter.stop();
 			}
 		}
+		updateChecker.stop();
+		updateChecker.removeUpdateListener(this);
+		soneDownloader.stop();
 		saveConfiguration();
 		stopped = true;
 	}
@@ -1410,8 +1549,17 @@ 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.getBooleanValue("Option/SoneRescueMode").setValue(options.getBooleanOption("SoneRescueMode").getReal());
 			configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal());
@@ -1449,6 +1597,10 @@ public class Core implements IdentityListener {
 
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.SEVERE, "Could not store configuration!", ce1);
+		} finally {
+			synchronized (configuration) {
+				storingConfiguration = false;
+			}
 		}
 	}
 
@@ -1599,4 +1751,16 @@ public class Core implements IdentityListener {
 		/* TODO */
 	}
 
+	//
+	// INTERFACE UpdateListener
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void updateFound(Version version, long releaseTime) {
+		coreListenerManager.fireUpdateFound(version, releaseTime);
+	}
+
 }