X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FDefaultElementLoader.kt;h=77cf9a834e1b087f526c11c5b243a8649d48fe1d;hb=11b5cd71eb4ce8a88b96b3c18b1cb038215a7710;hp=956d73be86b5011450a211126edb33e5d7852a48;hpb=6e91e9356231217afcecb12275882c0ebf0f34a8;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 956d73b..77cf9a8 100644
--- a/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
@@ -1,18 +1,25 @@
 package net.pterodactylus.sone.core
 
+import com.google.common.base.Ticker
 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
 
 /**
  * [ElementLoader] implementation that uses a simple Guava [com.google.common.cache.Cache].
  */
-class DefaultElementLoader @Inject constructor(private val freenetInterface: FreenetInterface) : ElementLoader {
+class DefaultElementLoader(private val freenetInterface: FreenetInterface, ticker: Ticker) : ElementLoader {
+
+	@Inject constructor(freenetInterface: FreenetInterface) : this(freenetInterface, Ticker.systemTicker())
 
 	private val loadingLinks = CacheBuilder.newBuilder().build<String, Boolean>()
-	private val imageCache = CacheBuilder.newBuilder().build<String, LinkedImage>()
+	private val failureCache = CacheBuilder.newBuilder().ticker(ticker).expireAfterWrite(30, MINUTES).build<String, Boolean>()
+	private val imageCache = CacheBuilder.newBuilder().build<String, LinkedElement>()
 	private val callback = object : FreenetInterface.BackgroundFetchCallback {
 		override fun cancelForMimeType(uri: FreenetURI, mimeType: String): Boolean {
 			return !mimeType.startsWith("image/")
@@ -25,36 +32,41 @@ class DefaultElementLoader @Inject constructor(private val freenetInterface: Fre
 			ByteArrayInputStream(data).use {
 				ImageIO.read(it)
 			}?.let {
-				imageCache.get(uri.toString()) { LinkedImage(uri.toString()) }
+				imageCache.get(uri.toString().decode().normalize()) { LinkedElement(uri.toString()) }
 			}
 			removeLoadingLink(uri)
 		}
 
 		override fun failed(uri: FreenetURI) {
+			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
 			}
-			if (loadingLinks.getIfPresent(link) == null) {
-				loadingLinks.put(link, true)
+			failureCache.getIfPresent(normalizedLink)?.run {
+				return LinkedElement(link, failed = true)
+			}
+			if (loadingLinks.getIfPresent(normalizedLink) == null) {
+				loadingLinks.put(normalizedLink, true)
 				freenetInterface.startFetch(FreenetURI(link), callback)
 			}
 		}
-		return object : LinkedElement {
-			override val link = link
-			override val loading = true
-		}
+		return LinkedElement(link, loading = true)
 	}
 
+	private fun String.decode() = URLDecoder.decode(this, "UTF-8")
+	private fun String.normalize() = Normalizer.normalize(this, Normalizer.Form.NFC)
+
 }