X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryBookmarkDatabase.java;h=594cf2b3bc05a1afcc82f8a19355eee1604ae1ad;hb=3b711e4ff7898c71778dd3a8695ee3e0e3542861;hp=1aec5734090e61aac828aa3a1a60d99f9f40714b;hpb=aba6bd1d58ef244050703e1b99d7389e024809c6;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java b/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java
index 1aec573..594cf2b 100644
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java
@@ -8,6 +8,7 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.Post.EmptyPost;
 import net.pterodactylus.sone.database.BookmarkDatabase;
 
 import com.google.common.base.Function;
@@ -21,27 +22,49 @@ public class MemoryBookmarkDatabase implements BookmarkDatabase {
 
 	private final ReadWriteLock lock = new ReentrantReadWriteLock();
 	private final MemoryDatabase memoryDatabase;
+	private final ConfigurationLoader configurationLoader;
 	private final Set<String> bookmarkedPosts = new HashSet<String>();
 
-	public MemoryBookmarkDatabase(MemoryDatabase memoryDatabase) {
+	public MemoryBookmarkDatabase(MemoryDatabase memoryDatabase,
+			ConfigurationLoader configurationLoader) {
 		this.memoryDatabase = memoryDatabase;
+		this.configurationLoader = configurationLoader;
 	}
 
-	@Override
-	public void bookmarkPost(String postId) {
+	public void start() {
+		loadBookmarkedPosts();
+	}
+
+	private void loadBookmarkedPosts() {
+		Set<String> bookmarkedPosts = configurationLoader.loadBookmarkedPosts();
 		lock.writeLock().lock();
 		try {
-			bookmarkedPosts.add(postId);
+			this.bookmarkedPosts.clear();
+			this.bookmarkedPosts.addAll(bookmarkedPosts);
 		} finally {
 			lock.writeLock().unlock();
 		}
 	}
 
+	public void stop() {
+		saveBookmarkedPosts();
+	}
+
+	private void saveBookmarkedPosts() {
+		lock.readLock().lock();
+		try {
+			configurationLoader.saveBookmarkedPosts(this.bookmarkedPosts);
+		} finally {
+			lock.readLock().unlock();
+		}
+	}
+
 	@Override
 	public void bookmarkPost(Post post) {
 		lock.writeLock().lock();
 		try {
 			bookmarkedPosts.add(post.getId());
+			saveBookmarkedPosts();
 		} finally {
 			lock.writeLock().unlock();
 		}
@@ -52,6 +75,7 @@ public class MemoryBookmarkDatabase implements BookmarkDatabase {
 		lock.writeLock().lock();
 		try {
 			bookmarkedPosts.remove(post.getId());
+			saveBookmarkedPosts();
 		} finally {
 			lock.writeLock().unlock();
 		}
@@ -71,11 +95,12 @@ public class MemoryBookmarkDatabase implements BookmarkDatabase {
 	public Set<Post> getBookmarkedPosts() {
 		lock.readLock().lock();
 		try {
-			return from(bookmarkedPosts).transformAndConcat(
-					new Function<String, Iterable<Post>>() {
+			return from(bookmarkedPosts).transform(
+					new Function<String, Post>() {
 						@Override
-						public Iterable<Post> apply(String postId) {
-							return memoryDatabase.getPost(postId).asSet();
+						public Post apply(String postId) {
+							return memoryDatabase.getPost(postId)
+									.or(new EmptyPost(postId));
 						}
 					}).toSet();
 		} finally {