fix(komga): use NightMonkeys WebP reader if present

Closes: #1294
gotson · Nov 29, 2023 · 7b1a9e4 · 7b1a9e4
1 parent 8832a0d
commit 7b1a9e4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/komga/build.gradle.kts b/komga/build.gradle.kts
@@ -99,6 +99,7 @@ dependencies {
   runtimeOnly("com.twelvemonkeys.imageio:imageio-webp:3.10.0")
   runtimeOnly("com.github.gotson.nightmonkeys:imageio-jxl:0.6.2")
   runtimeOnly("com.github.gotson.nightmonkeys:imageio-heif:0.6.2")
+  runtimeOnly("com.github.gotson.nightmonkeys:imageio-webp:0.6.2")
   // support for jpeg2000
   runtimeOnly("com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0")
   runtimeOnly("org.apache.pdfbox:jbig2-imageio:3.0.4")

diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageConverter.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageConverter.kt
@@ -9,11 +9,15 @@ import java.awt.image.BufferedImage
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
 import javax.imageio.ImageIO
+import javax.imageio.spi.IIORegistry
+import javax.imageio.spi.ImageReaderSpi
 import kotlin.math.max
 import kotlin.math.min
 
 private val logger = KotlinLogging.logger {}
 
+private const val webpNightMonkeys = "com.github.gotson.nightmonkeys.webp.imageio.plugins.WebpImageReaderSpi"
+
 @Service
 class ImageConverter(
   private val imageAnalyzer: ImageAnalyzer,
@@ -26,12 +30,31 @@ class ImageConverter(
   val supportedWriteMediaTypes by lazy { ImageIO.getWriterMIMETypes().toList() }
 
   init {
+    chooseWebpReader()
     logger.info { "Supported read formats: $supportedReadFormats" }
     logger.info { "Supported read mediaTypes: $supportedReadMediaTypes" }
     logger.info { "Supported write formats: $supportedWriteFormats" }
     logger.info { "Supported write mediaTypes: $supportedWriteMediaTypes" }
   }
 
+  private fun chooseWebpReader() {
+    val providers = IIORegistry.getDefaultInstance().getServiceProviders(
+      ImageReaderSpi::class.java,
+      { it is ImageReaderSpi && it.mimeTypes.contains("image/webp") },
+      false,
+    ).asSequence().toList()
+
+    if (providers.size > 1) {
+      logger.debug { "WebP reader providers: ${providers.map { it.javaClass.canonicalName }}" }
+      providers.firstOrNull { it.javaClass.canonicalName == webpNightMonkeys }?.let { nightMonkeys ->
+        (providers - nightMonkeys).forEach {
+          logger.debug { "Deregister provider: ${it.javaClass.canonicalName}" }
+          IIORegistry.getDefaultInstance().deregisterServiceProvider(it)
+        }
+      }
+    }
+  }
+
   private val supportsTransparency = listOf("png")
 
   fun canConvertMediaType(from: String, to: String) =