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=77cf9a834e1b087f526c11c5b243a8649d48fe1d;hpb=11b5cd71eb4ce8a88b96b3c18b1cb038215a7710;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 77cf9a8..5758c47 100644
--- a/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
@@ -1,6 +1,7 @@
 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
@@ -17,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) {
@@ -66,7 +67,7 @@ class DefaultElementLoader(private val freenetInterface: FreenetInterface, ticke
 		return LinkedElement(link, loading = true)
 	}
 
-	private fun String.decode() = URLDecoder.decode(this, "UTF-8")
-	private fun String.normalize() = Normalizer.normalize(this, Normalizer.Form.NFC)
+	private fun String.decode() = URLDecoder.decode(this, "UTF-8")!!
+	private fun String.normalize() = Normalizer.normalize(this, Normalizer.Form.NFC)!!
 
 }