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

all: reformat

Browse source
This commit is contained in:
Alexander Capehart 2024-12-21 11:52:12 -05:00
parent 9a38877c2e
commit 001db620e3
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
5 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/oxycblt/auxio/music/MusicModule.kt
View file

@ -25,8 +25,8 @@ import dagger.Provides
import dagger.hilt.InstallIn import dagger.hilt.InstallIn
import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.components.SingletonComponent import dagger.hilt.components.SingletonComponent
import org.oxycblt.musikr.cache.Cache
import javax.inject.Singleton import javax.inject.Singleton
import org.oxycblt.musikr.cache.Cache
import org.oxycblt.musikr.playlist.db.StoredPlaylists import org.oxycblt.musikr.playlist.db.StoredPlaylists
@Module @Module
@ -40,9 +40,7 @@ interface MusicModule {
@Module @Module
@InstallIn(SingletonComponent::class) @InstallIn(SingletonComponent::class)
class MusikrShimModule { class MusikrShimModule {
@Singleton @Singleton @Provides fun cache(@ApplicationContext context: Context) = Cache.from(context)
@Provides
fun cache(@ApplicationContext context: Context) = Cache.from(context)
@Singleton @Singleton
@Provides @Provides

5
app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
View file

@ -367,10 +367,7 @@ constructor(
if (withCache) { if (withCache) {
revision = musicSettings.revision revision = musicSettings.revision
storage = storage =
Storage( Storage(cache, MutableRevisionedStoredCovers(context, revision), storedPlaylists)
cache,
MutableRevisionedStoredCovers(context, revision),
storedPlaylists)
} else { } else {
revision = UUID.randomUUID() revision = UUID.randomUUID()
storage = storage =

7
app/src/main/java/org/oxycblt/auxio/music/RevisionedLibrary.kt
View file

@ -19,7 +19,6 @@
package org.oxycblt.auxio.music package org.oxycblt.auxio.music
import android.content.Context import android.content.Context
import androidx.media3.common.util.Log
import java.util.UUID import java.util.UUID
import org.oxycblt.auxio.util.unlikelyToBeNull import org.oxycblt.auxio.util.unlikelyToBeNull
import org.oxycblt.musikr.cover.Cover import org.oxycblt.musikr.cover.Cover
@ -29,7 +28,8 @@ import org.oxycblt.musikr.cover.StoredCovers
open class RevisionedStoredCovers(private val context: Context, private val revision: UUID?) : open class RevisionedStoredCovers(private val context: Context, private val revision: UUID?) :
StoredCovers { StoredCovers {
protected val inner = revision?.let { StoredCovers.from(context, "covers_$it", CoverFormat.jpeg()) } protected val inner =
revision?.let { StoredCovers.from(context, "covers_$it", CoverFormat.jpeg()) }
override suspend fun obtain(id: String): RevisionedCover? { override suspend fun obtain(id: String): RevisionedCover? {
val split = id.split('@', limit = 2) val split = id.split('@', limit = 2)
@ -43,7 +43,8 @@ open class RevisionedStoredCovers(private val context: Context, private val revi
val storedCovers = unlikelyToBeNull(inner) val storedCovers = unlikelyToBeNull(inner)
return storedCovers.obtain(coverId)?.let { RevisionedCover(revision, it) } return storedCovers.obtain(coverId)?.let { RevisionedCover(revision, it) }
} else { } else {
val storedCovers = StoredCovers.from(context, "covers_$coverRevision", CoverFormat.jpeg()) val storedCovers =
StoredCovers.from(context, "covers_$coverRevision", CoverFormat.jpeg())
return storedCovers.obtain(coverId)?.let { RevisionedCover(coverRevision, it) } return storedCovers.obtain(coverId)?.let { RevisionedCover(coverRevision, it) }
} }
} }

6
musikr/src/main/java/org/oxycblt/musikr/cache/Cache.kt vendored
View file

@ -50,9 +50,7 @@ private class CacheImpl(private val cacheInfoDao: CacheInfoDao) : Cache() {
} }
class WriteOnlyCache(private val inner: Cache) : Cache() { class WriteOnlyCache(private val inner: Cache) : Cache() {
override suspend fun read(file: DeviceFile, storedCovers: StoredCovers) = override suspend fun read(file: DeviceFile, storedCovers: StoredCovers) = CacheResult.Miss(file)
CacheResult.Miss(file)
override suspend fun write(song: RawSong) = override suspend fun write(song: RawSong) = inner.write(song)
inner.write(song)
} }

5
musikr/src/main/java/org/oxycblt/musikr/pipeline/EvaluateStep.kt
View file

@ -18,7 +18,6 @@
package org.oxycblt.musikr.pipeline package org.oxycblt.musikr.pipeline
import android.util.Log
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
@ -79,9 +78,7 @@ private class EvaluateStepImpl(
val graphBuild = val graphBuild =
merge( merge(
filterFlow.manager, filterFlow.manager,
preSongs.onEach { preSongs.onEach { wrap(it, graphBuilder::add) },
wrap(it, graphBuilder::add)
},
prePlaylists.onEach { wrap(it, graphBuilder::add) }) prePlaylists.onEach { wrap(it, graphBuilder::add) })
graphBuild.collect() graphBuild.collect()
val graph = graphBuilder.build() val graph = graphBuilder.build()