From 3528392f9514b4a3cbd187e965b0d42b1bd877a6 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Mon, 9 Dec 2024 08:58:45 -0700 Subject: [PATCH] musikr: rename indexer to musikr --- .../oxycblt/auxio/music/MusicRepository.kt | 6 ++--- .../oxycblt/musikr/{Indexer.kt => Musikr.kt} | 8 +++---- .../java/org/oxycblt/musikr/StackModule.kt | 4 ++-- .../java/org/oxycblt/musikr/fs/FsModule.kt | 7 ------ .../oxycblt/musikr/fs/query/DeviceFiles.kt | 6 ++--- .../oxycblt/musikr/fs/query/QueryModule.kt | 23 +++++++++++++++---- .../musikr/metadata/AudioProperties.kt | 5 ++-- .../oxycblt/musikr/pipeline/ExploreStep.kt | 2 +- .../oxycblt/musikr/tag/interpret/PreMusic.kt | 2 +- 9 files changed, 34 insertions(+), 29 deletions(-) rename app/src/main/java/org/oxycblt/musikr/{Indexer.kt => Musikr.kt} (97%) diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt index a68b04b4b..026b33604 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt @@ -25,7 +25,7 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.withContext import kotlinx.coroutines.yield import org.oxycblt.auxio.music.MusicRepository.IndexingWorker -import org.oxycblt.musikr.Indexer +import org.oxycblt.musikr.Musikr import org.oxycblt.musikr.IndexingProgress import org.oxycblt.musikr.Library import org.oxycblt.musikr.Music @@ -203,7 +203,7 @@ interface MusicRepository { class MusicRepositoryImpl @Inject -constructor(private val indexer: Indexer, private val musicSettings: MusicSettings) : +constructor(private val musikr: Musikr, private val musicSettings: MusicSettings) : MusicRepository { private val updateListeners = mutableListOf() private val indexingListeners = mutableListOf() @@ -350,7 +350,7 @@ constructor(private val indexer: Indexer, private val musicSettings: MusicSettin val locations = musicSettings.musicLocations val newLibrary = - indexer.run(locations, Interpretation(nameFactory, separators), ::emitIndexingProgress) + musikr.run(locations, Interpretation(nameFactory, separators), ::emitIndexingProgress) emitIndexingCompletion(null) diff --git a/app/src/main/java/org/oxycblt/musikr/Indexer.kt b/app/src/main/java/org/oxycblt/musikr/Musikr.kt similarity index 97% rename from app/src/main/java/org/oxycblt/musikr/Indexer.kt rename to app/src/main/java/org/oxycblt/musikr/Musikr.kt index cadf40979..3257db05e 100644 --- a/app/src/main/java/org/oxycblt/musikr/Indexer.kt +++ b/app/src/main/java/org/oxycblt/musikr/Musikr.kt @@ -1,6 +1,6 @@ /* * Copyright (c) 2024 Auxio Project - * Indexer.kt is part of Auxio. + * Musikr.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 @@ -31,7 +31,7 @@ import org.oxycblt.musikr.pipeline.ExploreStep import org.oxycblt.musikr.pipeline.ExtractStep import org.oxycblt.musikr.tag.Interpretation -interface Indexer { +interface Musikr { suspend fun run( locations: List, interpretation: Interpretation, @@ -50,13 +50,13 @@ sealed interface IndexingProgress { data object Indeterminate : IndexingProgress } -class IndexerImpl +class MusikrImpl @Inject constructor( private val exploreStep: ExploreStep, private val extractStep: ExtractStep, private val evaluateStep: EvaluateStep -) : Indexer { +) : Musikr { override suspend fun run( locations: List, interpretation: Interpretation, diff --git a/app/src/main/java/org/oxycblt/musikr/StackModule.kt b/app/src/main/java/org/oxycblt/musikr/StackModule.kt index 49795ae06..9d0c4d665 100644 --- a/app/src/main/java/org/oxycblt/musikr/StackModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/StackModule.kt @@ -25,6 +25,6 @@ import dagger.hilt.components.SingletonComponent @Module @InstallIn(SingletonComponent::class) -interface StackModule { - @Binds fun indexer(impl: IndexerImpl): Indexer +interface MusikrModule { + @Binds fun musikr(impl: MusikrImpl): Musikr } diff --git a/app/src/main/java/org/oxycblt/musikr/fs/FsModule.kt b/app/src/main/java/org/oxycblt/musikr/fs/FsModule.kt index ffcc7e7b0..2106ce402 100644 --- a/app/src/main/java/org/oxycblt/musikr/fs/FsModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/fs/FsModule.kt @@ -18,17 +18,10 @@ package org.oxycblt.musikr.fs -import android.content.ContentResolver -import android.content.Context import dagger.Binds import dagger.Module -import dagger.Provides import dagger.hilt.InstallIn -import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import org.oxycblt.musikr.fs.query.DeviceFiles -import org.oxycblt.musikr.fs.query.DeviceFilesImpl -import org.oxycblt.musikr.fs.query.contentResolverSafe @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/org/oxycblt/musikr/fs/query/DeviceFiles.kt b/app/src/main/java/org/oxycblt/musikr/fs/query/DeviceFiles.kt index e9231614d..df670f6f8 100644 --- a/app/src/main/java/org/oxycblt/musikr/fs/query/DeviceFiles.kt +++ b/app/src/main/java/org/oxycblt/musikr/fs/query/DeviceFiles.kt @@ -68,8 +68,7 @@ class DeviceFilesImpl @Inject constructor(@ApplicationContext private val contex ): Flow = flow { contentResolver.useQuery( DocumentsContract.buildChildDocumentsUriUsingTree(rootUri, treeDocumentId), - PROJECTION - ) { cursor -> + PROJECTION) { cursor -> val childUriIndex = cursor.getColumnIndexOrThrow(DocumentsContract.Document.COLUMN_DOCUMENT_ID) val displayNameIndex = @@ -101,8 +100,7 @@ class DeviceFilesImpl @Inject constructor(@ApplicationContext private val contex mimeType, newPath, size, - lastModified) - ) + lastModified)) } } emitAll(recursive.asFlow().flattenMerge()) diff --git a/app/src/main/java/org/oxycblt/musikr/fs/query/QueryModule.kt b/app/src/main/java/org/oxycblt/musikr/fs/query/QueryModule.kt index 8874a01a0..a47ee69b3 100644 --- a/app/src/main/java/org/oxycblt/musikr/fs/query/QueryModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/fs/query/QueryModule.kt @@ -1,3 +1,21 @@ +/* + * Copyright (c) 2024 Auxio Project + * QueryModule.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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package org.oxycblt.musikr.fs.query import android.content.ContentResolver @@ -8,8 +26,6 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import org.oxycblt.musikr.fs.MusicLocation -import org.oxycblt.musikr.fs.MusicLocationFactoryImpl @Module @InstallIn(SingletonComponent::class) @@ -22,6 +38,5 @@ class QueryProvidesModule { @Module @InstallIn(SingletonComponent::class) interface QueryBindsModule { - @Binds - fun deviceFiles(deviceFilesImpl: DeviceFilesImpl): DeviceFiles + @Binds fun deviceFiles(deviceFilesImpl: DeviceFilesImpl): DeviceFiles } diff --git a/app/src/main/java/org/oxycblt/musikr/metadata/AudioProperties.kt b/app/src/main/java/org/oxycblt/musikr/metadata/AudioProperties.kt index 15753cc0a..cec4a637d 100644 --- a/app/src/main/java/org/oxycblt/musikr/metadata/AudioProperties.kt +++ b/app/src/main/java/org/oxycblt/musikr/metadata/AudioProperties.kt @@ -23,8 +23,8 @@ import android.media.MediaExtractor import android.media.MediaFormat import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject -import org.oxycblt.musikr.fs.MimeType import org.oxycblt.musikr.Song +import org.oxycblt.musikr.fs.MimeType import timber.log.Timber as L /** @@ -119,7 +119,6 @@ constructor(@ApplicationContext private val context: Context) : AudioProperties. return AudioProperties( bitrate, sampleRate, - MimeType(fromExtension = song.mimeType.fromExtension, fromFormat = formatMimeType) - ) + MimeType(fromExtension = song.mimeType.fromExtension, fromFormat = formatMimeType)) } } diff --git a/app/src/main/java/org/oxycblt/musikr/pipeline/ExploreStep.kt b/app/src/main/java/org/oxycblt/musikr/pipeline/ExploreStep.kt index b5d826a3c..25801ded4 100644 --- a/app/src/main/java/org/oxycblt/musikr/pipeline/ExploreStep.kt +++ b/app/src/main/java/org/oxycblt/musikr/pipeline/ExploreStep.kt @@ -24,9 +24,9 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.asFlow import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.mapNotNull +import org.oxycblt.musikr.fs.MusicLocation import org.oxycblt.musikr.fs.query.DeviceFile import org.oxycblt.musikr.fs.query.DeviceFiles -import org.oxycblt.musikr.fs.MusicLocation import org.oxycblt.musikr.playlist.m3u.M3U interface ExploreStep { diff --git a/app/src/main/java/org/oxycblt/musikr/tag/interpret/PreMusic.kt b/app/src/main/java/org/oxycblt/musikr/tag/interpret/PreMusic.kt index e0798dc45..bcdd468eb 100644 --- a/app/src/main/java/org/oxycblt/musikr/tag/interpret/PreMusic.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/interpret/PreMusic.kt @@ -23,8 +23,8 @@ import java.util.UUID import org.oxycblt.auxio.music.MusicType import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment import org.oxycblt.auxio.util.update -import org.oxycblt.musikr.fs.MimeType import org.oxycblt.musikr.Music +import org.oxycblt.musikr.fs.MimeType import org.oxycblt.musikr.fs.Path import org.oxycblt.musikr.playlist.PlaylistHandle import org.oxycblt.musikr.tag.Date