projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some logging to element loader
[Sone.git]
/
src
/
main
/
kotlin
/
net
/
pterodactylus
/
sone
/
core
/
DefaultElementLoader.kt
diff --git
a/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
b/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
index
eabfed8
..
3f33efe
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt
@@
-1,36
+1,51
@@
package net.pterodactylus.sone.core
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 com.google.common.cache.CacheBuilder
import freenet.keys.FreenetURI
import java.io.ByteArrayInputStream
+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].
*/
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 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 {
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 loaded(uri: FreenetURI, mimeType: String, data: ByteArray) {
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 {
if (!mimeType.startsWith("image/")) {
return
}
ByteArrayInputStream(data).use {
ImageIO.read(it)
}?.let {
- imageCache.get(uri.toString()) { LinkedImage(uri.toString()) }
+ println("Successfully parsed images from $uri.")
+ imageCache.get(uri.toString()) { LinkedElement(uri.toString()) }
}
removeLoadingLink(uri)
}
override fun failed(uri: FreenetURI) {
}
removeLoadingLink(uri)
}
override fun failed(uri: FreenetURI) {
+ println("Failed to load $uri.")
+ failureCache.put(uri.toString(), true)
removeLoadingLink(uri)
}
private fun removeLoadingLink(uri: FreenetURI) {
removeLoadingLink(uri)
}
private fun removeLoadingLink(uri: FreenetURI) {
+ println("Not loading anymore: $uri.")
synchronized(loadingLinks) {
loadingLinks.invalidate(uri.toString())
}
synchronized(loadingLinks) {
loadingLinks.invalidate(uri.toString())
}
@@
-38,19
+53,24
@@
class DefaultElementLoader @Inject constructor(private val freenetInterface: Fre
}
override fun loadElement(link: String): LinkedElement {
}
override fun loadElement(link: String): LinkedElement {
+ println("Checking for $link...")
synchronized(loadingLinks) {
imageCache.getIfPresent(link)?.run {
synchronized(loadingLinks) {
imageCache.getIfPresent(link)?.run {
+ println("In the Image Cache: $link")
return this
}
return this
}
+ failureCache.getIfPresent(link)?.run {
+ println("In the Failure Cache: $link")
+ return LinkedElement(link, failed = true)
+ }
if (loadingLinks.getIfPresent(link) == null) {
if (loadingLinks.getIfPresent(link) == null) {
+ println("Not loading: $link")
loadingLinks.put(link, true)
freenetInterface.startFetch(FreenetURI(link), callback)
}
}
loadingLinks.put(link, true)
freenetInterface.startFetch(FreenetURI(link), callback)
}
}
- return object : LinkedElement {
- override val link = link
- override val loading = true
- }
+ println("Returning loading element: $link")
+ return LinkedElement(link, loading = true)
}
}
}
}