Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2026-05-09 05:10:19 +02:00
Code Issues Projects Releases Wiki Activity

fix: add configuration to unload native webp library

Browse source
This commit is contained in:
Gauthier Roebroeck 2021-04-28 14:58:50 +08:00
parent abb6439ba9
commit 64a805e019
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/configuration/KomgaProperties.kt
View file

@ -18,6 +18,8 @@ class KomgaProperties {
var rememberMe = RememberMe() var rememberMe = RememberMe()
var nativeWebp: Boolean = true
var database = Database() var database = Database()
class RememberMe { class RememberMe {

24
komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageConverter.kt
View file

@ -3,6 +3,7 @@ package org.gotson.komga.infrastructure.image
import com.luciad.imageio.webp.WebP import com.luciad.imageio.webp.WebP
import mu.KotlinLogging import mu.KotlinLogging
import net.coobird.thumbnailator.Thumbnails import net.coobird.thumbnailator.Thumbnails
import org.gotson.komga.infrastructure.configuration.KomgaProperties
import org.springframework.stereotype.Service import org.springframework.stereotype.Service
import java.awt.Color import java.awt.Color
import java.awt.image.BufferedImage import java.awt.image.BufferedImage
@ -14,7 +15,9 @@ import javax.imageio.spi.ImageReaderSpi
private val logger = KotlinLogging.logger {} private val logger = KotlinLogging.logger {}
@Service @Service
class ImageConverter { class ImageConverter(
private val komgaProperties: KomgaProperties,
) {
val supportedReadFormats by lazy { ImageIO.getReaderFormatNames().toList() } val supportedReadFormats by lazy { ImageIO.getReaderFormatNames().toList() }
val supportedReadMediaTypes by lazy { ImageIO.getReaderMIMETypes().toList() } val supportedReadMediaTypes by lazy { ImageIO.getReaderMIMETypes().toList() }
@ -35,12 +38,19 @@ class ImageConverter {
} as ImageReaderSpi? } as ImageReaderSpi?
if (nativeWebp != null) { if (nativeWebp != null) {
if (!WebP.loadNativeLibrary()) { when {
logger.warn { "Could not load native WebP library" } !komgaProperties.nativeWebp -> {
registry.deregisterServiceProvider(nativeWebp) logger.warn { "Unloading native WebP library" }
} else if (javaWebp != null) { registry.deregisterServiceProvider(nativeWebp)
logger.info { "Using native WebP library" } }
registry.setOrdering(ImageReaderSpi::class.java, nativeWebp, javaWebp) !WebP.loadNativeLibrary() -> {
logger.warn { "Could not load native WebP library" }
registry.deregisterServiceProvider(nativeWebp)
}
javaWebp != null -> {
logger.info { "Using native WebP library" }
registry.setOrdering(ImageReaderSpi::class.java, nativeWebp, javaWebp)
}
} }
} }