From: David ‘Bombe’ Roden Date: Fri, 11 Nov 2016 07:11:27 +0000 (+0100) Subject: Add image loader X-Git-Tag: 0.9.7^2~449 X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=5331998f4c37d54637737b79e5ef8844dc64d72b Add image loader --- diff --git a/src/main/kotlin/net/pterodactylus/sone/core/DefaultImageLoader.kt b/src/main/kotlin/net/pterodactylus/sone/core/DefaultImageLoader.kt new file mode 100644 index 0000000..469feb8 --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/core/DefaultImageLoader.kt @@ -0,0 +1,38 @@ +package net.pterodactylus.sone.core + +import com.google.common.cache.CacheBuilder +import freenet.keys.FreenetURI +import java.io.ByteArrayInputStream +import javax.imageio.ImageIO + +/** + * [ImageLoader] implementation that uses a simple Guava [com.google.common.cache.Cache]. + */ +class DefaultImageLoader(private val freenetInterface: FreenetInterface) : ImageLoader { + + private val imageCache = CacheBuilder.newBuilder().build() + private val callback = object : FreenetInterface.BackgroundFetchCallback { + override fun loaded(uri: FreenetURI, mimeType: String, data: ByteArray) { + if (!mimeType.startsWith("image/")) { + return + } + val image = ByteArrayInputStream(data).use { + ImageIO.read(it) + } + val loadedImage = LoadedImage(uri.toString(), mimeType, image.width, image.height) + imageCache.get(uri.toString()) { loadedImage } + } + + override fun failed(uri: FreenetURI) { + } + } + + override fun toLoadedImage(link: String): LoadedImage? { + imageCache.getIfPresent(link)?.run { + return this + } + freenetInterface.startFetch(FreenetURI(link), callback) + return null + } + +} diff --git a/src/main/kotlin/net/pterodactylus/sone/core/ImageLoader.kt b/src/main/kotlin/net/pterodactylus/sone/core/ImageLoader.kt new file mode 100644 index 0000000..6d7fb36 --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/core/ImageLoader.kt @@ -0,0 +1,12 @@ +package net.pterodactylus.sone.core + +/** + * Component that loads images and supplies information about them. + */ +interface ImageLoader { + + fun toLoadedImage(link: String): LoadedImage? + +} + +data class LoadedImage(val link: String, val mimeType: String, val width: Int, val height: Int) diff --git a/src/test/kotlin/net/pterodactylus/sone/core/DefaultImageLoaderTest.kt b/src/test/kotlin/net/pterodactylus/sone/core/DefaultImageLoaderTest.kt new file mode 100644 index 0000000..cc31665 --- /dev/null +++ b/src/test/kotlin/net/pterodactylus/sone/core/DefaultImageLoaderTest.kt @@ -0,0 +1,59 @@ +package net.pterodactylus.sone.core + +import com.google.common.io.ByteStreams +import com.google.common.io.Files +import freenet.keys.FreenetURI +import net.pterodactylus.sone.core.FreenetInterface.BackgroundFetchCallback +import net.pterodactylus.sone.test.capture +import net.pterodactylus.sone.test.mock +import org.hamcrest.MatcherAssert +import org.hamcrest.MatcherAssert.assertThat +import org.hamcrest.Matchers +import org.hamcrest.Matchers.`is` +import org.hamcrest.Matchers.nullValue +import org.junit.Test +import org.mockito.ArgumentMatchers.any +import org.mockito.ArgumentMatchers.eq +import org.mockito.Mockito.verify +import java.io.ByteArrayOutputStream + +/** + * Unit test for [DefaultImageLoaderTest]. + */ +class DefaultImageLoaderTest { + + companion object { + private const val IMAGE_ID = "KSK@gpl.png" + } + + private val freenetInterface = mock() + private val imageLoader = DefaultImageLoader(freenetInterface) + private val callback = capture() + + @Test + fun `image loader starts request for link that is not known`() { + assertThat(imageLoader.toLoadedImage(IMAGE_ID), nullValue()) + verify(freenetInterface).startFetch(eq(FreenetURI(IMAGE_ID)), any()) + } + + @Test + fun `image loader can load image`() { + assertThat(imageLoader.toLoadedImage(IMAGE_ID), nullValue()) + verify(freenetInterface).startFetch(eq(FreenetURI(IMAGE_ID)), callback.capture()) + callback.value.loaded(FreenetURI(IMAGE_ID), "image/png", read("/static/images/unknown-image-0.png")) + val loadedImage = imageLoader.toLoadedImage(IMAGE_ID)!! + assertThat(loadedImage.link, `is`(IMAGE_ID)) + assertThat(loadedImage.mimeType, `is`("image/png")) + assertThat(loadedImage.width, `is`(200)) + assertThat(loadedImage.height, `is`(150)) + } + + private fun read(resource: String): ByteArray = + javaClass.getResourceAsStream(resource)?.use { input -> + ByteArrayOutputStream().use { + ByteStreams.copy(input, it) + it + }.toByteArray() + } ?: ByteArray(0) + +} diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Mockotlin.kt b/src/test/kotlin/net/pterodactylus/sone/test/Mockotlin.kt index ed2f3fc..5ce82df 100644 --- a/src/test/kotlin/net/pterodactylus/sone/test/Mockotlin.kt +++ b/src/test/kotlin/net/pterodactylus/sone/test/Mockotlin.kt @@ -1,5 +1,7 @@ package net.pterodactylus.sone.test +import org.mockito.ArgumentCaptor import org.mockito.Mockito inline fun mock(): T = Mockito.mock(T::class.java)!! +inline fun capture(): ArgumentCaptor = ArgumentCaptor.forClass(T::class.java)