Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

musikr: clean up as-is setting

Browse source
This commit is contained in:
Alexander Capehart 2025-03-03 15:15:43 -07:00
parent b48bf3729e
commit 859e31d825
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
3 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt
View file

@ -21,8 +21,8 @@ package org.oxycblt.auxio.image.covers
import java.util.UUID import java.util.UUID
import org.oxycblt.musikr.cover.CoverParams import org.oxycblt.musikr.cover.CoverParams
data class CoverSilo(val revision: UUID, val params: CoverParams) { data class CoverSilo(val revision: UUID, val params: CoverParams?) {
override fun toString() = "${revision}.${params.resolution}.${params.quality}" override fun toString() = "${revision}.${params?.let { "${params.resolution}${params.quality}" }}"
companion object { companion object {
fun parse(silo: String): CoverSilo? { fun parse(silo: String): CoverSilo? {

12
app/src/main/java/org/oxycblt/auxio/image/covers/SettingCovers.kt
View file

@ -54,19 +54,11 @@ constructor(private val imageSettings: ImageSettings, private val identifier: Co
CoverMode.SAVE_SPACE -> siloedCovers(context, revision, CoverParams.of(500, 70)) CoverMode.SAVE_SPACE -> siloedCovers(context, revision, CoverParams.of(500, 70))
CoverMode.BALANCED -> siloedCovers(context, revision, CoverParams.of(750, 85)) CoverMode.BALANCED -> siloedCovers(context, revision, CoverParams.of(750, 85))
CoverMode.HIGH_QUALITY -> siloedCovers(context, revision, CoverParams.of(1000, 100)) 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( MutableCovers.chain(
MutableSiloedCovers.from(context, CoverSilo(revision, with), identifier), MutableSiloedCovers.from(context, CoverSilo(revision, with), identifier),
MutableFolderCovers(context)) 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))
} }

2
app/src/main/java/org/oxycblt/auxio/image/covers/SiloedCovers.kt
View file

@ -130,7 +130,7 @@ private data class SiloCore(val rootDir: File, val files: AppFiles, val format:
revisionDir = rootDir.resolve(silo.toString()).apply { mkdirs() } revisionDir = rootDir.resolve(silo.toString()).apply { mkdirs() }
} }
val files = AppFiles.at(revisionDir) 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) return SiloCore(rootDir, files, format)
} }
} }