X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FDefaultElementLoader.kt;h=e07af9338268f36f5129985ccca99a3bfa4932d0;hb=b739f34bb13029472389137f4cb3632ddec6c57c;hp=9eae5977815baecf0935bd4dcb401577f8658dda;hpb=5b0a3b1498a972ec1dedfcb97d6b831d03e58b07;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 9eae597..e07af93 100644
--- a/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
@@ -21,33 +21,28 @@ class DefaultElementLoader(private val freenetInterface: FreenetInterface, ticke
 	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 {
-			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().decode().normalize()) { LinkedElement(uri.toString()) }
 			}
 			removeLoadingLink(uri)
 		}
 
 		override fun failed(uri: FreenetURI) {
-			println("Failed to load $uri.")
 			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().decode().normalize())
 			}
@@ -56,23 +51,18 @@ class DefaultElementLoader(private val freenetInterface: FreenetInterface, ticke
 
 	override fun loadElement(link: String): LinkedElement {
 		val normalizedLink = link.decode().normalize()
-		println("Checking for $normalizedLink...")
 		synchronized(loadingLinks) {
 			imageCache.getIfPresent(normalizedLink)?.run {
-				println("In the Image Cache: $normalizedLink")
 				return this
 			}
 			failureCache.getIfPresent(normalizedLink)?.run {
-				println("In the Failure Cache: $normalizedLink")
 				return LinkedElement(link, failed = true)
 			}
 			if (loadingLinks.getIfPresent(normalizedLink) == null) {
-				println("Not loading: $normalizedLink")
 				loadingLinks.put(normalizedLink, true)
 				freenetInterface.startFetch(FreenetURI(link), callback)
 			}
 		}
-		println("Returning loading element: $normalizedLink")
 		return LinkedElement(link, loading = true)
 	}