X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.java;h=c778de2a1c7e3ec95a69dc79f811f4151df5757b;hb=1f15b9eae9ca9453452f16b1cc76e05b3bcfb696;hp=77ff2f4df24f8f78cd324fbb3bc954e1ccefdc2c;hpb=1e26b571992db3757943c00ac4db6d7131c5aed3;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
index 77ff2f4..c778de2 100644
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@ -35,12 +35,11 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.data.impl.AlbumBuilderImpl;
-import net.pterodactylus.sone.database.AlbumBuilder;
 import net.pterodactylus.sone.database.Database;
 import net.pterodactylus.sone.database.DatabaseException;
 import net.pterodactylus.sone.database.PostBuilder;
@@ -51,6 +50,8 @@ import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
 
 import com.google.common.base.Optional;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ListMultimap;
 import com.google.common.collect.SortedSetMultimap;
 import com.google.common.collect.TreeMultimap;
 import com.google.common.util.concurrent.AbstractService;
@@ -103,6 +104,10 @@ public class MemoryDatabase extends AbstractService implements Database {
 	private final Set<String> knownPostReplies = new HashSet<String>();
 
 	private final Map<String, Album> allAlbums = new HashMap<String, Album>();
+	private final ListMultimap<String, String> albumChildren = ArrayListMultimap.create();
+	private final ListMultimap<String, String> albumImages = ArrayListMultimap.create();
+
+	private final Map<String, Image> allImages = new HashMap<String, Image>();
 
 	/**
 	 * Creates a new memory database.
@@ -432,33 +437,66 @@ public class MemoryDatabase extends AbstractService implements Database {
 	}
 
 	//
-	// ALBUMBUILDERFACTORY METHODS
+	// ALBUMSTORE METHODS
 	//
 
 	@Override
-	public AlbumBuilder newAlbumBuilder() {
-		return new AlbumBuilderImpl();
+	public void storeAlbum(Album album) {
+		lock.writeLock().lock();
+		try {
+			allAlbums.put(album.getId(), album);
+			albumChildren.put(album.getParent().getId(), album.getId());
+		} finally {
+			lock.writeLock().unlock();
+		}
+	}
+
+	@Override
+	public void removeAlbum(Album album) {
+		lock.writeLock().lock();
+		try {
+			allAlbums.remove(album.getId());
+			albumChildren.remove(album.getParent().getId(), album.getId());
+		} finally {
+			lock.writeLock().unlock();
+		}
 	}
 
 	//
-	// ALBUMSTORE METHODS
+	// IMAGEPROVIDER METHODS
 	//
 
 	@Override
-	public void storeAlbum(Album album) {
+	public Optional<Image> getImage(String imageId) {
+		lock.readLock().lock();
+		try {
+			return fromNullable(allImages.get(imageId));
+		} finally {
+			lock.readLock().unlock();
+		}
+	}
+
+	//
+	// IMAGESTORE METHODS
+	//
+
+	@Override
+	public void storeImage(Image image) {
 		lock.writeLock().lock();
 		try {
-			allAlbums.put(album.getId(), album);
+			allImages.put(image.getId(), image);
+			albumImages.put(image.getAlbum().getId(), image.getId());
 		} finally {
 			lock.writeLock().unlock();
 		}
 	}
 
 	@Override
-	public void removeAlbum(Album album) {
+	public void removeImage(Image image) {
 		lock.writeLock().lock();
 		try {
-			allAlbums.remove(album.getId());
+			allImages.remove(image.getId());
+			albumImages.remove(image.getAlbum().getId(), image.getId());
 		} finally {
 			lock.writeLock().unlock();
 		}