X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.kt;h=ad7ab078b253f047c00c752bec18a438d5021527;hb=8f223b8d369004637373003c9f6a294fe4af732d;hp=8722873aa0e7a4740a017fb1ad073ed17c7d26d1;hpb=90993f1fc13288b83996066e726653b4dd011479;p=Sone.git

diff --git a/src/main/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabase.kt b/src/main/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabase.kt
index 8722873..ad7ab07 100644
--- a/src/main/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabase.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabase.kt
@@ -21,19 +21,20 @@ import com.google.common.base.Preconditions.checkNotNull
 import com.google.common.collect.HashMultimap
 import com.google.common.collect.Multimap
 import com.google.common.collect.TreeMultimap
-import com.google.common.util.concurrent.*
+import com.google.common.util.concurrent.AbstractService
+import com.google.common.util.concurrent.RateLimiter
 import com.google.inject.Inject
 import com.google.inject.Singleton
 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.TIME_COMPARATOR
 import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.data.Sone.toAllAlbums
-import net.pterodactylus.sone.data.Sone.toAllImages
+import net.pterodactylus.sone.data.allAlbums
+import net.pterodactylus.sone.data.allImages
 import net.pterodactylus.sone.data.impl.AlbumBuilderImpl
 import net.pterodactylus.sone.data.impl.ImageBuilderImpl
+import net.pterodactylus.sone.data.newestReplyFirst
 import net.pterodactylus.sone.database.AlbumBuilder
 import net.pterodactylus.sone.database.Database
 import net.pterodactylus.sone.database.DatabaseException
@@ -41,10 +42,13 @@ import net.pterodactylus.sone.database.ImageBuilder
 import net.pterodactylus.sone.database.PostBuilder
 import net.pterodactylus.sone.database.PostDatabase
 import net.pterodactylus.sone.database.PostReplyBuilder
-import net.pterodactylus.sone.utils.*
+import net.pterodactylus.sone.utils.ifTrue
+import net.pterodactylus.sone.utils.unit
 import net.pterodactylus.util.config.Configuration
 import net.pterodactylus.util.config.ConfigurationException
 import java.util.concurrent.locks.ReentrantReadWriteLock
+import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock
 import kotlin.concurrent.withLock
 
 /**
@@ -54,15 +58,15 @@ import kotlin.concurrent.withLock
 class MemoryDatabase @Inject constructor(private val configuration: Configuration) : AbstractService(), Database {
 
 	private val lock = ReentrantReadWriteLock()
-	private val readLock by lazy { lock.readLock()!! }
-	private val writeLock by lazy { lock.writeLock()!! }
+	private val readLock: ReadLock by lazy { lock.readLock() }
+	private val writeLock: WriteLock by lazy { lock.writeLock() }
 	private val configurationLoader = ConfigurationLoader(configuration)
 	private val allSones = mutableMapOf<String, Sone>()
 	private val allPosts = mutableMapOf<String, Post>()
 	private val sonePosts: Multimap<String, Post> = HashMultimap.create<String, Post>()
 	private val knownPosts = mutableSetOf<String>()
-	private val allPostReplies = mutableMapOf<String, PostReply>()
-	private val sonePostReplies: Multimap<String, PostReply> = TreeMultimap.create<String, PostReply>(Comparator { leftString, rightString -> leftString.compareTo(rightString) }, TIME_COMPARATOR)
+	private val allPostReplies = mutableMapOf<String, MemoryPostReply.Shell>()
+	private val sonePostReplies: Multimap<String, PostReply> = TreeMultimap.create<String, PostReply>(Comparator { leftString, rightString -> leftString.compareTo(rightString) }, newestReplyFirst)
 	private val knownPostReplies = mutableSetOf<String>()
 	private val allAlbums = mutableMapOf<String, Album>()
 	private val soneAlbums: Multimap<String, Album> = HashMultimap.create<String, Album>()
@@ -121,15 +125,15 @@ class MemoryDatabase @Inject constructor(private val configuration: Configuratio
 			}
 			sonePostReplies.putAll(sone.id, sone.replies)
 			for (postReply in sone.replies) {
-				allPostReplies[postReply.id] = postReply
+				allPostReplies[postReply.id] = postReply.toShell()
 			}
-			soneAlbums.putAll(sone.id, toAllAlbums.apply(sone)!!)
-			for (album in toAllAlbums.apply(sone)!!) {
-				allAlbums[album.id] = album
+			sone.allAlbums.let { albums ->
+				soneAlbums.putAll(sone.id, albums)
+				albums.forEach { album -> allAlbums[album.id] = album }
 			}
-			soneImages.putAll(sone.id, toAllImages.apply(sone)!!)
-			for (image in toAllImages.apply(sone)!!) {
-				allImages[image.id] = image
+			sone.rootAlbum.allImages.let { images ->
+				soneImages.putAll(sone.id, images)
+				images.forEach { image -> allImages[image.id] = image }
 			}
 		}
 	}
@@ -221,13 +225,16 @@ class MemoryDatabase @Inject constructor(private val configuration: Configuratio
 		}
 	}
 
-	override fun getPostReply(id: String) = readLock.withLock { allPostReplies[id] }
+	override fun getPostReply(id: String) = readLock.withLock {
+		allPostReplies[id]?.build(newPostReplyBuilder())
+	}
 
 	override fun getReplies(postId: String) =
 			readLock.withLock {
 				allPostReplies.values
 						.filter { it.postId == postId }
-						.sortedWith(TIME_COMPARATOR)
+						.map { it.build(newPostReplyBuilder()) }
+						.sortedWith(newestReplyFirst.reversed())
 			}
 
 	override fun newPostReplyBuilder(): PostReplyBuilder =
@@ -235,7 +242,7 @@ class MemoryDatabase @Inject constructor(private val configuration: Configuratio
 
 	override fun storePostReply(postReply: PostReply) =
 			writeLock.withLock {
-				allPostReplies[postReply.id] = postReply
+				allPostReplies[postReply.id] = postReply.toShell()
 			}
 
 	override fun removePostReply(postReply: PostReply) =
@@ -295,14 +302,11 @@ class MemoryDatabase @Inject constructor(private val configuration: Configuratio
 				saveKnownPosts()
 			}
 
-	protected fun isPostReplyKnown(postReply: PostReply) = readLock.withLock { postReply.id in knownPostReplies }
+	internal fun isPostReplyKnown(postReply: PostReply) = readLock.withLock { postReply.id in knownPostReplies }
 
-	fun setPostReplyKnown(postReply: PostReply, known: Boolean): Unit =
+	override fun setPostReplyKnown(postReply: PostReply): Unit =
 			writeLock.withLock {
-				if (known)
-					knownPostReplies.add(postReply.id)
-				else
-					knownPostReplies.remove(postReply.id)
+				knownPostReplies.add(postReply.id)
 				saveKnownPostReplies()
 			}