X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=d61211d5b4001bd55486df923a0133a53aa1510b;hp=7dc398e62ba18fe8b0d86ccd49001b1052690cbd;hb=33f333b35a73d3d4a4e79f41e9dd7b342db87b1a;hpb=cd1a52cf4426d23240d59be0a433d8f1763f2911

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 7dc398e..d61211d 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.Profile.Field;
@@ -165,6 +167,12 @@ public class Core implements IdentityListener, UpdateListener {
 	/** Trusted identities, sorted by own identities. */
 	private Map<OwnIdentity, Set<Identity>> trustedIdentities = Collections.synchronizedMap(new HashMap<OwnIdentity, Set<Identity>>());
 
+	/** 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.
 	 *
@@ -722,6 +730,76 @@ public class Core implements IdentityListener, UpdateListener {
 		return posts;
 	}
 
+	/**
+	 * 	
+	 * 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
 	//
@@ -1605,6 +1683,40 @@ public class Core implements IdentityListener, UpdateListener {
 	}
 
 	/**
+	 * 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() {