[#1496] Image conversion (#1505)

* [#1496] First conversion attempt * [#1496] Configurable conversion * Fix: allow nested configs (map) * [#1496] Support explicit `none` conversion * Use MimeUtils for provided download * [1496] Support image conversion on load for downloaded images * Lint * [#1496] Support conversion on fresh download as well Previous commit was only for already downloaded images, now also for fresh and cached * [#1496] Refactor: Move where conversion for download happens * Rewrite config handling, improve custom types * Lint * Add format to pages mutation * Lint * Standardize url encode * Lint * Config: Allow additional conversion parameters * Implement conversion quality parameter * Lint * Implement a conversion util to allow fallback readers * Add downloadConversions to api and backup, fix updateValue issues * Lint * Minor cleanup * Update libs.versions.toml --------- Co-authored-by: Syer10 <syer10@users.noreply.github.com>
2026-07-09 05:44:33 -05:00 · 2025-07-14 23:51:18 +02:00
parent 09c950a890
commit df0078b725
24 changed files with 464 additions and 167 deletions
--- a/server/src/main/kotlin/suwayomi/tachidesk/util/ConversionUtil.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/util/ConversionUtil.kt
@@ -0,0 +1,52 @@
+package suwayomi.tachidesk.util
+
+import io.github.oshai.kotlinlogging.KotlinLogging
+import java.awt.image.BufferedImage
+import java.io.File
+import java.io.InputStream
+import javax.imageio.ImageIO
+
+object ConversionUtil {
+    val logger = KotlinLogging.logger {}
+
+    public fun readImage(image: File): BufferedImage? {
+        val readers = ImageIO.getImageReadersBySuffix(image.extension)
+        image.inputStream().use {
+            ImageIO.createImageInputStream(it).use { inputStream ->
+                for (reader in readers) {
+                    try {
+                        reader.setInput(inputStream)
+                        return reader.read(0)
+                    } catch (e: Throwable) {
+                        logger.debug(e) { "Reader ${reader.javaClass.name} not suitable" }
+                    } finally {
+                        reader.dispose()
+                    }
+                }
+            }
+        }
+        logger.info { "No suitable image converter found for ${image.name}" }
+        return null
+    }
+
+    public fun readImage(
+        image: InputStream,
+        mimeType: String,
+    ): BufferedImage? {
+        val readers = ImageIO.getImageReadersByMIMEType(mimeType)
+        ImageIO.createImageInputStream(image).use { inputStream ->
+            for (reader in readers) {
+                try {
+                    reader.setInput(inputStream)
+                    return reader.read(0)
+                } catch (e: Throwable) {
+                    logger.debug(e) { "Reader ${reader.javaClass.name} not suitable" }
+                } finally {
+                    reader.dispose()
+                }
+            }
+        }
+        logger.info { "No suitable image converter found for $mimeType" }
+        return null
+    }
+}