X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FDefaultElementLoader.kt;h=409d18c6f2004c1d698ea60913fa07ef4fc79001;hp=f553ae84d2ac87ef41cc4e6fc7334f111e4f0ea6;hb=HEAD;hpb=71d9b57ce88771258d2d3678b90bb5a55c6e4d9e

diff --git a/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt b/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
index f553ae8..409d18c 100644
--- a/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
@@ -19,27 +19,27 @@ import javax.inject.Inject
 /**
  * [ElementLoader] implementation that uses a simple Guava [com.google.common.cache.Cache].
  */
-class DefaultElementLoader(private val freenetInterface: FreenetInterface, ticker: Ticker) : ElementLoader {
+class DefaultElementLoader(private val freenetInterface: FreenetInterface, ticker: Ticker): ElementLoader {
 
-	@Inject constructor(freenetInterface: FreenetInterface) : this(freenetInterface, Ticker.systemTicker())
+	@Inject constructor(freenetInterface: FreenetInterface): this(freenetInterface, Ticker.systemTicker())
 
-	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 elementCache: Cache<String, LinkedElement> = CacheBuilder.newBuilder().build<String, LinkedElement>()
-	private val callback = object : FreenetInterface.BackgroundFetchCallback {
+	private val loadingLinks: Cache<String, Boolean> = CacheBuilder.newBuilder().build()
+	private val failureCache: Cache<String, Boolean> = CacheBuilder.newBuilder().ticker(ticker).expireAfterWrite(30, MINUTES).build()
+	private val elementCache: Cache<String, LinkedElement> = CacheBuilder.newBuilder().build()
+	private val callback = object: FreenetInterface.BackgroundFetchCallback {
 		override fun shouldCancel(uri: FreenetURI, mimeType: String, size: Long): Boolean {
 			return (size > 2097152) || (!mimeType.startsWith("image/") && !mimeType.startsWith("text/html"))
 		}
 
-		override fun loaded(uri: FreenetURI, mimeType: String, data: ByteArray) {
-			MimeType(mimeType).also { mimeType ->
+		override fun loaded(uri: FreenetURI, mimeTypeText: String, data: ByteArray) {
+			MimeType(mimeTypeText).also { mimeType ->
 				when {
 					mimeType.primaryType == "image" -> {
 						ByteArrayInputStream(data).use {
 							ImageIO.read(it)
 						}?.let {
 							elementCache.get(uri.toString().decode().normalize()) {
-								LinkedElement(uri.toString(), properties = mapOf("size" to data.size, "sizeHuman" to data.size.human))
+								LinkedElement(uri.toString(), properties = mapOf("type" to "image", "size" to data.size, "sizeHuman" to data.size.human))
 							}
 						}
 					}
@@ -47,7 +47,7 @@ class DefaultElementLoader(private val freenetInterface: FreenetInterface, ticke
 						val document = Jsoup.parse(data.toString(Charset.forName(mimeType.getParameter("charset") ?: "UTF-8")))
 						elementCache.get(uri.toString().decode().normalize()) {
 							LinkedElement(uri.toString(), properties = mapOf(
-									"size" to data.size, "sizeHuman" to data.size.human,
+									"type" to "html", "size" to data.size, "sizeHuman" to data.size.human,
 									"title" to document.title().emptyToNull,
 									"description" to (document.metaDescription ?: document.firstNonHeadingParagraph)
 							))