diff --git a/app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt b/app/src/main/java/org/oxycblt/auxio/image/covers/CoversModule.kt similarity index 67% rename from app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt rename to app/src/main/java/org/oxycblt/auxio/image/covers/CoversModule.kt index 735dd1cda..96a08f6db 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/covers/CoversModule.kt @@ -1,6 +1,6 @@ /* - * Copyright (c) 2024 Auxio Project - * CoverSilo.kt is part of Auxio. + * Copyright (c) 2023 Auxio Project + * CoversModule.kt is part of Auxio. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,11 +18,13 @@ package org.oxycblt.auxio.image.covers -import java.util.UUID +import dagger.Binds +import dagger.Module +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent -private fun String.toUuidOrNull(): UUID? = - try { - UUID.fromString(this) - } catch (e: IllegalArgumentException) { - null - } +@Module +@InstallIn(SingletonComponent::class) +interface CoilModule { + @Binds fun settingCovers(imageSettings: SettingCoversImpl): SettingCovers +} 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 85cc24f1a..b0271456b 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 @@ -47,9 +47,7 @@ interface SettingCovers { } } -class SettingCoversImpl -@Inject -constructor(private val imageSettings: ImageSettings, private val identifier: CoverIdentifier) : +class SettingCoversImpl @Inject constructor(private val imageSettings: ImageSettings) : SettingCovers { override suspend fun mutate(context: Context, revision: UUID): MutableCovers { val coverStorage = CoverStorage.at(context.coversDir()) @@ -63,7 +61,8 @@ constructor(private val imageSettings: ImageSettings, private val identifier: Co } val revisionedTranscoding = RevisionedTranscoding(revision, transcoding) val storedCovers = - MutableStoredCovers(EmbeddedCovers(identifier), coverStorage, revisionedTranscoding) + MutableStoredCovers( + EmbeddedCovers(CoverIdentifier.md5()), coverStorage, revisionedTranscoding) val fsCovers = MutableFSCovers(context) return MutableCovers.chain(storedCovers, fsCovers) }