X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FDefaultElementLoader.kt;h=5758c473e37552cf6cf35fd5ba8b8f1a97bd791d;hb=7bb75fc81cd59d728fbc076a0d7356e43720c92a;hp=ac3ab6a3d3c1bf8005c22c3cdc66949f71ec8d44;hpb=e7dffc33d7632aeeb41eeeef53f0170b34dd0137;p=Sone.git

diff --git a/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt b/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
index ac3ab6a..5758c47 100644
--- 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,12 +18,12 @@ 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 {
-			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) {
@@ -30,37 +33,41 @@ class DefaultElementLoader(private val freenetInterface: FreenetInterface, ticke
 			ByteArrayInputStream(data).use {
 				ImageIO.read(it)
 			}?.let {
-				imageCache.get(uri.toString()) { LinkedElement(uri.toString()) }
+				imageCache.get(uri.toString().decode().normalize()) { LinkedElement(uri.toString()) }
 			}
 			removeLoadingLink(uri)
 		}
 
 		override fun failed(uri: FreenetURI) {
-			failureCache.put(uri.toString(), true)
+			failureCache.put(uri.toString().decode().normalize(), true)
 			removeLoadingLink(uri)
 		}
 
 		private fun removeLoadingLink(uri: FreenetURI) {
 			synchronized(loadingLinks) {
-				loadingLinks.invalidate(uri.toString())
+				loadingLinks.invalidate(uri.toString().decode().normalize())
 			}
 		}
 	}
 
 	override fun loadElement(link: String): LinkedElement {
+		val normalizedLink = link.decode().normalize()
 		synchronized(loadingLinks) {
-			imageCache.getIfPresent(link)?.run {
+			imageCache.getIfPresent(normalizedLink)?.run {
 				return this
 			}
-			failureCache.getIfPresent(link)?.run {
+			failureCache.getIfPresent(normalizedLink)?.run {
 				return LinkedElement(link, failed = true)
 			}
-			if (loadingLinks.getIfPresent(link) == null) {
-				loadingLinks.put(link, true)
+			if (loadingLinks.getIfPresent(normalizedLink) == null) {
+				loadingLinks.put(normalizedLink, true)
 				freenetInterface.startFetch(FreenetURI(link), callback)
 			}
 		}
 		return LinkedElement(link, loading = true)
 	}
 
+	private fun String.decode() = URLDecoder.decode(this, "UTF-8")!!
+	private fun String.normalize() = Normalizer.normalize(this, Normalizer.Form.NFC)!!
+
 }