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

music: collapse metadata into musikr

Browse source
This commit is contained in:
Alexander Capehart 2024-11-30 17:25:58 -07:00
parent dfff01bd28
commit 43c05e7096
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
9 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
View file

@ -49,7 +49,7 @@ import org.oxycblt.auxio.music.MusicRepository
import org.oxycblt.auxio.music.MusicType import org.oxycblt.auxio.music.MusicType
import org.oxycblt.auxio.music.Playlist import org.oxycblt.auxio.music.Playlist
import org.oxycblt.auxio.music.Song import org.oxycblt.auxio.music.Song
import org.oxycblt.auxio.music.metadata.AudioProperties import org.oxycblt.auxio.musikr.metadata.AudioProperties
import org.oxycblt.auxio.playback.PlaySong import org.oxycblt.auxio.playback.PlaySong
import org.oxycblt.auxio.playback.PlaybackSettings import org.oxycblt.auxio.playback.PlaybackSettings
import org.oxycblt.auxio.util.Event import org.oxycblt.auxio.util.Event

2
app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt
View file

@ -35,7 +35,7 @@ import org.oxycblt.auxio.list.adapter.UpdateInstructions
import org.oxycblt.auxio.music.Music import org.oxycblt.auxio.music.Music
import org.oxycblt.auxio.music.Song import org.oxycblt.auxio.music.Song
import org.oxycblt.auxio.musikr.model.Name import org.oxycblt.auxio.musikr.model.Name
import org.oxycblt.auxio.music.metadata.AudioProperties import org.oxycblt.auxio.musikr.metadata.AudioProperties
import org.oxycblt.auxio.music.resolveNames import org.oxycblt.auxio.music.resolveNames
import org.oxycblt.auxio.playback.formatDurationMs import org.oxycblt.auxio.playback.formatDurationMs
import org.oxycblt.auxio.playback.replaygain.formatDb import org.oxycblt.auxio.playback.replaygain.formatDb

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

@ -26,7 +26,7 @@ import kotlinx.coroutines.withContext
import kotlinx.coroutines.yield import kotlinx.coroutines.yield
import org.oxycblt.auxio.music.MusicRepository.IndexingWorker import org.oxycblt.auxio.music.MusicRepository.IndexingWorker
import org.oxycblt.auxio.musikr.model.Name import org.oxycblt.auxio.musikr.model.Name
import org.oxycblt.auxio.music.metadata.Separators import org.oxycblt.auxio.musikr.interpret.Separators
import org.oxycblt.auxio.musikr.Indexer import org.oxycblt.auxio.musikr.Indexer
import org.oxycblt.auxio.musikr.IndexingProgress import org.oxycblt.auxio.musikr.IndexingProgress
import org.oxycblt.auxio.musikr.interpret.Interpretation import org.oxycblt.auxio.musikr.interpret.Interpretation

1
app/src/main/java/org/oxycblt/auxio/music/metadata/SeparatorsDialog.kt
View file

@ -29,6 +29,7 @@ import org.oxycblt.auxio.BuildConfig
import org.oxycblt.auxio.R import org.oxycblt.auxio.R
import org.oxycblt.auxio.databinding.DialogSeparatorsBinding import org.oxycblt.auxio.databinding.DialogSeparatorsBinding
import org.oxycblt.auxio.music.MusicSettings import org.oxycblt.auxio.music.MusicSettings
import org.oxycblt.auxio.musikr.interpret.Separators
import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment
import timber.log.Timber as L import timber.log.Timber as L

1
app/src/main/java/org/oxycblt/auxio/musikr/interpret/Interpretation.kt
View file

@ -19,6 +19,5 @@
package org.oxycblt.auxio.musikr.interpret package org.oxycblt.auxio.musikr.interpret
import org.oxycblt.auxio.musikr.model.Name import org.oxycblt.auxio.musikr.model.Name
import org.oxycblt.auxio.music.metadata.Separators
data class Interpretation(val nameFactory: Name.Known.Factory, val separators: Separators) data class Interpretation(val nameFactory: Name.Known.Factory, val separators: Separators)

2
app/src/main/java/org/oxycblt/auxio/music/metadata/Separators.kt → app/src/main/java/org/oxycblt/auxio/musikr/interpret/Separators.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package org.oxycblt.auxio.music.metadata package org.oxycblt.auxio.musikr.interpret
import org.oxycblt.auxio.musikr.tag.extractor.correctWhitespace import org.oxycblt.auxio.musikr.tag.extractor.correctWhitespace
import org.oxycblt.auxio.musikr.tag.extractor.splitEscaped import org.oxycblt.auxio.musikr.tag.extractor.splitEscaped

2
app/src/main/java/org/oxycblt/auxio/music/metadata/AudioProperties.kt → app/src/main/java/org/oxycblt/auxio/musikr/metadata/AudioProperties.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package org.oxycblt.auxio.music.metadata package org.oxycblt.auxio.musikr.metadata
import android.content.Context import android.content.Context
import android.media.MediaExtractor import android.media.MediaExtractor

2
app/src/main/java/org/oxycblt/auxio/music/metadata/MetadataModule.kt → app/src/main/java/org/oxycblt/auxio/musikr/metadata/MetadataModule.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package org.oxycblt.auxio.music.metadata package org.oxycblt.auxio.musikr.metadata
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module

1
app/src/test/java/org/oxycblt/auxio/music/metadata/SeparatorsTest.kt
View file

@ -20,6 +20,7 @@ package org.oxycblt.auxio.music.metadata
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Test import org.junit.Test
import org.oxycblt.auxio.musikr.interpret.Separators
class SeparatorsTest { class SeparatorsTest {
@Test @Test