From 192136e66ce2c8192f62d3aa7d8cbdeaf54c954f Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Sun, 20 Jul 2025 23:00:00 +0200 Subject: [PATCH] Change "download conversion compression level" type to Double (#1535) https://opensource.expediagroup.com/graphql-kotlin/docs/schema-generator/writing-schemas/scalars/#primitive-types --- .../kotlin/suwayomi/tachidesk/graphql/types/SettingsType.kt | 4 ++-- .../manga/impl/backup/proto/models/BackupServerSettings.kt | 2 +- .../manga/impl/download/fileProvider/ChaptersFilesProvider.kt | 2 +- .../src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SettingsType.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SettingsType.kt index 6b5c65f3..c5f66c38 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SettingsType.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SettingsType.kt @@ -117,13 +117,13 @@ interface Settings : Node { interface SettingsDownloadConversion { val mimeType: String val target: String - val compressionLevel: Float? + val compressionLevel: Double? } class SettingsDownloadConversionType( override val mimeType: String, override val target: String, - override val compressionLevel: Float?, + override val compressionLevel: Double?, ) : SettingsDownloadConversion data class PartialSettingsType( diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupServerSettings.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupServerSettings.kt index 89b14e04..dae300d2 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupServerSettings.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupServerSettings.kt @@ -89,6 +89,6 @@ data class BackupServerSettings( class BackupSettingsDownloadConversionType( @ProtoNumber(1) override val mimeType: String, @ProtoNumber(2) override val target: String, - @ProtoNumber(3) override val compressionLevel: Float?, + @ProtoNumber(3) override val compressionLevel: Double?, ) : SettingsDownloadConversion } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/fileProvider/ChaptersFilesProvider.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/fileProvider/ChaptersFilesProvider.kt index eecf9b53..f6709f66 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/fileProvider/ChaptersFilesProvider.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/fileProvider/ChaptersFilesProvider.kt @@ -231,7 +231,7 @@ abstract class ChaptersFilesProvider( val writerParams = writer.defaultWriteParam targetConversion.compressionLevel?.let { writerParams.compressionMode = ImageWriteParam.MODE_EXPLICIT - writerParams.compressionQuality = it + writerParams.compressionQuality = it.toFloat() } val success = try { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt index 1b68b7c5..68a31935 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt @@ -130,7 +130,7 @@ class ServerConfig( data class DownloadConversion( val target: String, - val compressionLevel: Float? = null, + val compressionLevel: Double? = null, ) // extensions