diff --git a/app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt b/app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt index 9d7413f65..63b246de6 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt @@ -21,8 +21,8 @@ package org.oxycblt.auxio.image.covers import java.util.UUID import org.oxycblt.musikr.cover.CoverParams -data class CoverSilo(val revision: UUID, val params: CoverParams) { - override fun toString() = "${revision}.${params.resolution}.${params.quality}" +data class CoverSilo(val revision: UUID, val params: CoverParams?) { + override fun toString() = "${revision}.${params?.let { "${params.resolution}${params.quality}" }}" companion object { fun parse(silo: String): CoverSilo? { diff --git a/app/src/main/java/org/oxycblt/auxio/image/covers/SettingCovers.kt b/app/src/main/java/org/oxycblt/auxio/image/covers/SettingCovers.kt index de5a6fbac..0c82d49eb 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/covers/SettingCovers.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/covers/SettingCovers.kt @@ -54,19 +54,11 @@ constructor(private val imageSettings: ImageSettings, private val identifier: Co CoverMode.SAVE_SPACE -> siloedCovers(context, revision, CoverParams.of(500, 70)) CoverMode.BALANCED -> siloedCovers(context, revision, CoverParams.of(750, 85)) CoverMode.HIGH_QUALITY -> siloedCovers(context, revision, CoverParams.of(1000, 100)) - CoverMode.AS_IS -> asIsCovers(context) + CoverMode.AS_IS -> siloedCovers(context, revision, null) } - private suspend fun siloedCovers(context: Context, revision: UUID, with: CoverParams) = + private suspend fun siloedCovers(context: Context, revision: UUID, with: CoverParams?) = MutableCovers.chain( MutableSiloedCovers.from(context, CoverSilo(revision, with), identifier), MutableFolderCovers(context)) - - private suspend fun asIsCovers(context: Context) = - MutableCovers.chain( - MutableFileCovers( - AppFiles.at(context.coversDir().resolve("asis").also { it.mkdirs() }), - CoverFormat.asIs(), - identifier), - MutableFolderCovers(context)) } diff --git a/app/src/main/java/org/oxycblt/auxio/image/covers/SiloedCovers.kt b/app/src/main/java/org/oxycblt/auxio/image/covers/SiloedCovers.kt index ab7e71d9c..856239698 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/covers/SiloedCovers.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/covers/SiloedCovers.kt @@ -130,7 +130,7 @@ private data class SiloCore(val rootDir: File, val files: AppFiles, val format: revisionDir = rootDir.resolve(silo.toString()).apply { mkdirs() } } val files = AppFiles.at(revisionDir) - val format = CoverFormat.jpeg(silo.params) + val format = silo.params?.let(CoverFormat::jpeg) ?: CoverFormat.asIs() return SiloCore(rootDir, files, format) } }