Fix some warnings

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / core / DefaultElementLoader.kt

diff --git a/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt b/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
index 3f33efe..5758c47 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
@@ -1,9 +1,12 @@
 package net.pterodactylus.sone.core
 
 import com.google.common.base.Ticker
+import com.google.common.cache.Cache
 import com.google.common.cache.CacheBuilder
 import freenet.keys.FreenetURI
 import java.io.ByteArrayInputStream
+import java.net.URLDecoder
+import java.text.Normalizer
 import java.util.concurrent.TimeUnit.MINUTES
 import javax.imageio.ImageIO
 import javax.inject.Inject
@@ -15,62 +18,56 @@ class DefaultElementLoader(private val freenetInterface: FreenetInterface, ticke
 
        @Inject constructor(freenetInterface: FreenetInterface) : this(freenetInterface, Ticker.systemTicker())
 
-       private val loadingLinks = CacheBuilder.newBuilder().build<String, Boolean>()
-       private val failureCache = CacheBuilder.newBuilder().ticker(ticker).expireAfterWrite(30, MINUTES).build<String, Boolean>()
-       private val imageCache = CacheBuilder.newBuilder().build<String, LinkedElement>()
+       private val loadingLinks: Cache<String, Boolean> = CacheBuilder.newBuilder().build<String, Boolean>()
+       private val failureCache: Cache<String, Boolean> = CacheBuilder.newBuilder().ticker(ticker).expireAfterWrite(30, MINUTES).build<String, Boolean>()
+       private val imageCache: Cache<String, LinkedElement> = CacheBuilder.newBuilder().build<String, LinkedElement>()
        private val callback = object : FreenetInterface.BackgroundFetchCallback {
-               override fun cancelForMimeType(uri: FreenetURI, mimeType: String): Boolean {
-                       println("Got MIME Type “$mimeType” for $uri.")
-                       return !mimeType.startsWith("image/")
+               override fun shouldCancel(uri: FreenetURI, mimeType: String, size: Long): Boolean {
+                       return !mimeType.startsWith("image/") || (size > 2097152)
                }
 
                override fun loaded(uri: FreenetURI, mimeType: String, data: ByteArray) {
-                       println("Got ${data.size} Bytes with MIME Type $mimeType for $uri.")
                        if (!mimeType.startsWith("image/")) {
                                return
                        }
                        ByteArrayInputStream(data).use {
                                ImageIO.read(it)
                        }?.let {
-                               println("Successfully parsed images from $uri.")
-                               imageCache.get(uri.toString()) { LinkedElement(uri.toString()) }
+                               imageCache.get(uri.toString().decode().normalize()) { LinkedElement(uri.toString()) }
                        }
                        removeLoadingLink(uri)
                }
 
                override fun failed(uri: FreenetURI) {
-                       println("Failed to load $uri.")
-                       failureCache.put(uri.toString(), true)
+                       failureCache.put(uri.toString().decode().normalize(), true)
                        removeLoadingLink(uri)
                }
 
                private fun removeLoadingLink(uri: FreenetURI) {
-                       println("Not loading anymore: $uri.")
                        synchronized(loadingLinks) {
-                               loadingLinks.invalidate(uri.toString())
+                               loadingLinks.invalidate(uri.toString().decode().normalize())
                        }
                }
        }
 
        override fun loadElement(link: String): LinkedElement {
-               println("Checking for $link...")
+               val normalizedLink = link.decode().normalize()
                synchronized(loadingLinks) {
-                       imageCache.getIfPresent(link)?.run {
-                               println("In the Image Cache: $link")
+                       imageCache.getIfPresent(normalizedLink)?.run {
                                return this
                        }
-                       failureCache.getIfPresent(link)?.run {
-                               println("In the Failure Cache: $link")
+                       failureCache.getIfPresent(normalizedLink)?.run {
                                return LinkedElement(link, failed = true)
                        }
-                       if (loadingLinks.getIfPresent(link) == null) {
-                               println("Not loading: $link")
-                               loadingLinks.put(link, true)
+                       if (loadingLinks.getIfPresent(normalizedLink) == null) {
+                               loadingLinks.put(normalizedLink, true)
                                freenetInterface.startFetch(FreenetURI(link), callback)
                        }
                }
-               println("Returning loading element: $link")
                return LinkedElement(link, loading = true)
        }
 
+       private fun String.decode() = URLDecoder.decode(this, "UTF-8")!!
+       private fun String.normalize() = Normalizer.normalize(this, Normalizer.Form.NFC)!!
+
 }