all: cleanup

app/src/main/java/org/oxycblt/auxio/MainFragment.kt

@@ -50,10 +50,8 @@ import org.oxycblt.auxio.home.HomeViewModel
 import org.oxycblt.auxio.home.Outer
 import org.oxycblt.auxio.list.ListViewModel
 import org.oxycblt.auxio.music.IndexingState
-import org.oxycblt.musikr.Music
 import org.oxycblt.auxio.music.MusicType
 import org.oxycblt.auxio.music.MusicViewModel
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.OpenPanel
 import org.oxycblt.auxio.playback.PlaybackBottomSheetBehavior
 import org.oxycblt.auxio.playback.PlaybackViewModel
@@ -70,6 +68,8 @@ import org.oxycblt.auxio.util.getDimen
 import org.oxycblt.auxio.util.lazyReflectedMethod
 import org.oxycblt.auxio.util.navigateSafe
 import org.oxycblt.auxio.util.unlikelyToBeNull
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt

@@ -29,13 +29,8 @@ import org.oxycblt.auxio.detail.list.AlbumDetailListAdapter
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.list.ListFragment
 import org.oxycblt.auxio.list.menu.Menu
-import org.oxycblt.musikr.Album
-import org.oxycblt.musikr.Music
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.PlaylistDecision
 import org.oxycblt.auxio.music.PlaylistMessage
-import org.oxycblt.musikr.Song
-import org.oxycblt.musikr.resolveNames
 import org.oxycblt.auxio.playback.PlaybackDecision
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.util.collect
@@ -44,6 +39,11 @@ import org.oxycblt.auxio.util.getPlural
 import org.oxycblt.auxio.util.navigateSafe
 import org.oxycblt.auxio.util.showToast
 import org.oxycblt.auxio.util.unlikelyToBeNull
+import org.oxycblt.musikr.Album
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.resolveNames
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt

@@ -29,14 +29,8 @@ import org.oxycblt.auxio.detail.list.ArtistDetailListAdapter
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.list.ListFragment
 import org.oxycblt.auxio.list.menu.Menu
-import org.oxycblt.musikr.Album
-import org.oxycblt.musikr.Artist
-import org.oxycblt.musikr.Music
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.PlaylistDecision
 import org.oxycblt.auxio.music.PlaylistMessage
-import org.oxycblt.musikr.Song
-import org.oxycblt.musikr.resolveNames
 import org.oxycblt.auxio.playback.PlaybackDecision
 import org.oxycblt.auxio.util.collect
 import org.oxycblt.auxio.util.collectImmediately
@@ -44,6 +38,12 @@ import org.oxycblt.auxio.util.getPlural
 import org.oxycblt.auxio.util.navigateSafe
 import org.oxycblt.auxio.util.showToast
 import org.oxycblt.auxio.util.unlikelyToBeNull
+import org.oxycblt.musikr.Album
+import org.oxycblt.musikr.Artist
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.resolveNames
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt

@@ -35,13 +35,13 @@ import org.oxycblt.auxio.list.ListFragment
 import org.oxycblt.auxio.list.ListViewModel
 import org.oxycblt.auxio.list.PlainDivider
 import org.oxycblt.auxio.list.PlainHeader
-import org.oxycblt.musikr.Music
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.MusicViewModel
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.util.getDimenPixels
 import org.oxycblt.auxio.util.overrideOnOverflowMenuClick
 import org.oxycblt.auxio.util.setFullWidthLookup
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.MusicParent
 
 abstract class DetailFragment<P : MusicParent, C : Music> :
     ListFragment<C, FragmentDetailBinding>(),

app/src/main/java/org/oxycblt/auxio/detail/DetailGenerator.kt

@@ -23,13 +23,13 @@ import javax.inject.Inject
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.list.ListSettings
 import org.oxycblt.auxio.list.sort.Sort
+import org.oxycblt.auxio.music.MusicRepository
+import org.oxycblt.auxio.music.MusicType
 import org.oxycblt.musikr.Album
 import org.oxycblt.musikr.Artist
 import org.oxycblt.musikr.Genre
 import org.oxycblt.musikr.Music
 import org.oxycblt.musikr.MusicParent
-import org.oxycblt.auxio.music.MusicRepository
-import org.oxycblt.auxio.music.MusicType
 import org.oxycblt.musikr.Playlist
 import org.oxycblt.musikr.Song
 import org.oxycblt.musikr.tag.Disc

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

@@ -40,21 +40,21 @@ import org.oxycblt.auxio.list.PlainDivider
 import org.oxycblt.auxio.list.PlainHeader
 import org.oxycblt.auxio.list.adapter.UpdateInstructions
 import org.oxycblt.auxio.list.sort.Sort
-import org.oxycblt.musikr.Album
-import org.oxycblt.musikr.Artist
-import org.oxycblt.musikr.Genre
-import org.oxycblt.musikr.Music
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.auxio.music.MusicType
-import org.oxycblt.musikr.Playlist
-import org.oxycblt.musikr.Song
-import org.oxycblt.musikr.metadata.AudioProperties
 import org.oxycblt.auxio.playback.PlaySong
 import org.oxycblt.auxio.playback.PlaybackSettings
 import org.oxycblt.auxio.util.Event
 import org.oxycblt.auxio.util.MutableEvent
 import org.oxycblt.auxio.util.unlikelyToBeNull
+import org.oxycblt.musikr.Album
+import org.oxycblt.musikr.Artist
+import org.oxycblt.musikr.Genre
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Playlist
+import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.metadata.AudioProperties
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt

@@ -29,13 +29,8 @@ import org.oxycblt.auxio.detail.list.GenreDetailListAdapter
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.list.ListFragment
 import org.oxycblt.auxio.list.menu.Menu
-import org.oxycblt.musikr.Artist
-import org.oxycblt.musikr.Genre
-import org.oxycblt.musikr.Music
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.PlaylistDecision
 import org.oxycblt.auxio.music.PlaylistMessage
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.PlaybackDecision
 import org.oxycblt.auxio.util.collect
 import org.oxycblt.auxio.util.collectImmediately
@@ -43,6 +38,11 @@ import org.oxycblt.auxio.util.getPlural
 import org.oxycblt.auxio.util.navigateSafe
 import org.oxycblt.auxio.util.showToast
 import org.oxycblt.auxio.util.unlikelyToBeNull
+import org.oxycblt.musikr.Artist
+import org.oxycblt.musikr.Genre
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt

@@ -35,13 +35,8 @@ import org.oxycblt.auxio.detail.list.PlaylistDragCallback
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.list.ListFragment
 import org.oxycblt.auxio.list.menu.Menu
-import org.oxycblt.musikr.Music
-import org.oxycblt.musikr.MusicParent
-import org.oxycblt.musikr.Playlist
 import org.oxycblt.auxio.music.PlaylistDecision
 import org.oxycblt.auxio.music.PlaylistMessage
-import org.oxycblt.musikr.Song
-import org.oxycblt.musikr.playlist.m3u.M3U
 import org.oxycblt.auxio.playback.PlaybackDecision
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.ui.DialogAwareNavigationListener
@@ -52,6 +47,11 @@ import org.oxycblt.auxio.util.getPlural
 import org.oxycblt.auxio.util.navigateSafe
 import org.oxycblt.auxio.util.showToast
 import org.oxycblt.auxio.util.unlikelyToBeNull
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Playlist
+import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.playlist.m3u.M3U
 import timber.log.Timber as L
 
 /**

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

@@ -32,16 +32,16 @@ import org.oxycblt.auxio.databinding.DialogSongDetailBinding
 import org.oxycblt.auxio.detail.list.SongProperty
 import org.oxycblt.auxio.detail.list.SongPropertyAdapter
 import org.oxycblt.auxio.list.adapter.UpdateInstructions
-import org.oxycblt.musikr.Music
-import org.oxycblt.musikr.Song
-import org.oxycblt.musikr.resolveNames
-import org.oxycblt.musikr.metadata.AudioProperties
-import org.oxycblt.musikr.tag.Name
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.playback.replaygain.formatDb
 import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.concatLocalized
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.metadata.AudioProperties
+import org.oxycblt.musikr.resolveNames
+import org.oxycblt.musikr.tag.Name
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/detail/decision/ArtistShowChoice.kt

@@ -25,9 +25,9 @@ import org.oxycblt.auxio.list.ClickableListListener
 import org.oxycblt.auxio.list.adapter.FlexibleListAdapter
 import org.oxycblt.auxio.list.adapter.SimpleDiffCallback
 import org.oxycblt.auxio.list.recycler.DialogRecyclerView
-import org.oxycblt.musikr.Artist
 import org.oxycblt.auxio.util.context
 import org.oxycblt.auxio.util.inflater
+import org.oxycblt.musikr.Artist
 
 /**
  * A [FlexibleListAdapter] that displays a list of [Artist] navigation choices, for use with

app/src/main/java/org/oxycblt/auxio/detail/decision/DetailDecisionViewModel.kt

@@ -23,11 +23,11 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.musikr.Album
 import org.oxycblt.musikr.Artist
 import org.oxycblt.musikr.Library
 import org.oxycblt.musikr.Music
-import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 

app/src/main/java/org/oxycblt/auxio/detail/decision/ShowArtistDialog.kt

@@ -32,9 +32,9 @@ import org.oxycblt.auxio.databinding.DialogMusicChoicesBinding
 import org.oxycblt.auxio.detail.DetailViewModel
 import org.oxycblt.auxio.list.ClickableListListener
 import org.oxycblt.auxio.list.adapter.UpdateInstructions
-import org.oxycblt.musikr.Artist
 import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment
 import org.oxycblt.auxio.util.collectImmediately
+import org.oxycblt.musikr.Artist
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/detail/list/AlbumDetailListAdapter.kt

@@ -35,14 +35,14 @@ import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.list.SelectableListListener
 import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter
 import org.oxycblt.auxio.list.adapter.SimpleDiffCallback
-import org.oxycblt.musikr.Album
-import org.oxycblt.musikr.Song
-import org.oxycblt.musikr.tag.Disc
-import org.oxycblt.musikr.tag.resolveNumber
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.util.context
 import org.oxycblt.auxio.util.getAttrColorCompat
 import org.oxycblt.auxio.util.inflater
+import org.oxycblt.musikr.Album
+import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.tag.Disc
+import org.oxycblt.musikr.tag.resolveNumber
 
 /**
  * An [DetailListAdapter] implementing the header and sub-items for the [Album] detail view.

app/src/main/java/org/oxycblt/auxio/detail/list/ArtistDetailListAdapter.kt

@@ -29,12 +29,12 @@ import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.list.SelectableListListener
 import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter
 import org.oxycblt.auxio.list.adapter.SimpleDiffCallback
+import org.oxycblt.auxio.util.context
+import org.oxycblt.auxio.util.inflater
 import org.oxycblt.musikr.Album
 import org.oxycblt.musikr.Artist
 import org.oxycblt.musikr.Music
 import org.oxycblt.musikr.Song
-import org.oxycblt.auxio.util.context
-import org.oxycblt.auxio.util.inflater
 
 /**
  * A [DetailListAdapter] implementing the header and sub-items for the [Artist] detail view.

app/src/main/java/org/oxycblt/auxio/detail/list/DetailListAdapter.kt

@@ -35,9 +35,9 @@ import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter
 import org.oxycblt.auxio.list.adapter.SimpleDiffCallback
 import org.oxycblt.auxio.list.recycler.BasicHeaderViewHolder
 import org.oxycblt.auxio.list.recycler.DividerViewHolder
-import org.oxycblt.musikr.Music
 import org.oxycblt.auxio.util.context
 import org.oxycblt.auxio.util.inflater
+import org.oxycblt.musikr.Music
 
 /**
  * A [RecyclerView.Adapter] that implements shared behavior between lists of child items in the

app/src/main/java/org/oxycblt/auxio/detail/list/PlaylistDetailListAdapter.kt

@@ -40,12 +40,12 @@ import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter
 import org.oxycblt.auxio.list.adapter.SimpleDiffCallback
 import org.oxycblt.auxio.list.recycler.MaterialDragCallback
 import org.oxycblt.auxio.list.recycler.SongViewHolder
-import org.oxycblt.musikr.Playlist
-import org.oxycblt.musikr.Song
-import org.oxycblt.musikr.resolveNames
 import org.oxycblt.auxio.util.context
 import org.oxycblt.auxio.util.getAttrColorCompat
 import org.oxycblt.auxio.util.inflater
+import org.oxycblt.musikr.Playlist
+import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.resolveNames
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/detail/sort/AlbumSongSortDialog.kt

@@ -26,8 +26,8 @@ import org.oxycblt.auxio.databinding.DialogSortBinding
 import org.oxycblt.auxio.detail.DetailViewModel
 import org.oxycblt.auxio.list.sort.Sort
 import org.oxycblt.auxio.list.sort.SortDialog
-import org.oxycblt.musikr.Album
 import org.oxycblt.auxio.util.collectImmediately
+import org.oxycblt.musikr.Album
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/detail/sort/ArtistSongSortDialog.kt

@@ -26,8 +26,8 @@ import org.oxycblt.auxio.databinding.DialogSortBinding
 import org.oxycblt.auxio.detail.DetailViewModel
 import org.oxycblt.auxio.list.sort.Sort
 import org.oxycblt.auxio.list.sort.SortDialog
-import org.oxycblt.musikr.Artist
 import org.oxycblt.auxio.util.collectImmediately
+import org.oxycblt.musikr.Artist
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/detail/sort/GenreSongSortDialog.kt

@@ -26,8 +26,8 @@ import org.oxycblt.auxio.databinding.DialogSortBinding
 import org.oxycblt.auxio.detail.DetailViewModel
 import org.oxycblt.auxio.list.sort.Sort
 import org.oxycblt.auxio.list.sort.SortDialog
-import org.oxycblt.musikr.Genre
 import org.oxycblt.auxio.util.collectImmediately
+import org.oxycblt.musikr.Genre
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/detail/sort/PlaylistSongSortDialog.kt

@@ -26,8 +26,8 @@ import org.oxycblt.auxio.databinding.DialogSortBinding
 import org.oxycblt.auxio.detail.DetailViewModel
 import org.oxycblt.auxio.list.sort.Sort
 import org.oxycblt.auxio.list.sort.SortDialog
-import org.oxycblt.musikr.Playlist
 import org.oxycblt.auxio.util.collectImmediately
+import org.oxycblt.musikr.Playlist
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt

@@ -59,14 +59,10 @@ import org.oxycblt.auxio.list.ListViewModel
 import org.oxycblt.auxio.list.SelectionFragment
 import org.oxycblt.auxio.list.menu.Menu
 import org.oxycblt.auxio.music.IndexingState
-import org.oxycblt.musikr.Music
 import org.oxycblt.auxio.music.MusicType
 import org.oxycblt.auxio.music.MusicViewModel
-import org.oxycblt.musikr.Playlist
 import org.oxycblt.auxio.music.PlaylistDecision
 import org.oxycblt.auxio.music.PlaylistMessage
-import org.oxycblt.musikr.IndexingProgress
-import org.oxycblt.musikr.playlist.m3u.M3U
 import org.oxycblt.auxio.playback.PlaybackDecision
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.util.collect
@@ -75,6 +71,10 @@ import org.oxycblt.auxio.util.lazyReflectedField
 import org.oxycblt.auxio.util.lazyReflectedMethod
 import org.oxycblt.auxio.util.navigateSafe
 import org.oxycblt.auxio.util.showToast
+import org.oxycblt.musikr.IndexingProgress
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.Playlist
+import org.oxycblt.musikr.playlist.m3u.M3U
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/home/HomeGenerator.kt

@@ -22,11 +22,11 @@ import javax.inject.Inject
 import org.oxycblt.auxio.home.tabs.Tab
 import org.oxycblt.auxio.list.ListSettings
 import org.oxycblt.auxio.list.adapter.UpdateInstructions
+import org.oxycblt.auxio.music.MusicRepository
+import org.oxycblt.auxio.music.MusicType
 import org.oxycblt.musikr.Album
 import org.oxycblt.musikr.Artist
 import org.oxycblt.musikr.Genre
-import org.oxycblt.auxio.music.MusicRepository
-import org.oxycblt.auxio.music.MusicType
 import org.oxycblt.musikr.Playlist
 import org.oxycblt.musikr.Song
 import timber.log.Timber as L

app/src/main/java/org/oxycblt/auxio/home/HomeViewModel.kt

@@ -27,16 +27,16 @@ import org.oxycblt.auxio.home.tabs.Tab
 import org.oxycblt.auxio.list.ListSettings
 import org.oxycblt.auxio.list.adapter.UpdateInstructions
 import org.oxycblt.auxio.list.sort.Sort
-import org.oxycblt.musikr.Album
-import org.oxycblt.musikr.Artist
-import org.oxycblt.musikr.Genre
 import org.oxycblt.auxio.music.MusicType
-import org.oxycblt.musikr.Playlist
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.PlaySong
 import org.oxycblt.auxio.playback.PlaybackSettings
 import org.oxycblt.auxio.util.Event
 import org.oxycblt.auxio.util.MutableEvent
+import org.oxycblt.musikr.Album
+import org.oxycblt.musikr.Artist
+import org.oxycblt.musikr.Genre
+import org.oxycblt.musikr.Playlist
+import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt

@@ -37,16 +37,16 @@ import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter
 import org.oxycblt.auxio.list.recycler.AlbumViewHolder
 import org.oxycblt.auxio.list.recycler.FastScrollRecyclerView
 import org.oxycblt.auxio.list.sort.Sort
-import org.oxycblt.musikr.Album
 import org.oxycblt.auxio.music.IndexingState
-import org.oxycblt.musikr.Music
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.MusicViewModel
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.playback.secsToMs
 import org.oxycblt.auxio.util.collectImmediately
+import org.oxycblt.musikr.Album
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Song
 
 /**
  * A [ListFragment] that shows a list of [Album]s.

app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt

@@ -35,16 +35,16 @@ import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter
 import org.oxycblt.auxio.list.recycler.ArtistViewHolder
 import org.oxycblt.auxio.list.recycler.FastScrollRecyclerView
 import org.oxycblt.auxio.list.sort.Sort
-import org.oxycblt.musikr.Artist
 import org.oxycblt.auxio.music.IndexingState
-import org.oxycblt.musikr.Music
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.MusicViewModel
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.positiveOrNull
+import org.oxycblt.musikr.Artist
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Song
 
 /**
  * A [ListFragment] that shows a list of [Artist]s.

app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt

@@ -35,15 +35,15 @@ import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter
 import org.oxycblt.auxio.list.recycler.FastScrollRecyclerView
 import org.oxycblt.auxio.list.recycler.GenreViewHolder
 import org.oxycblt.auxio.list.sort.Sort
-import org.oxycblt.musikr.Genre
 import org.oxycblt.auxio.music.IndexingState
-import org.oxycblt.musikr.Music
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.MusicViewModel
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.util.collectImmediately
+import org.oxycblt.musikr.Genre
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Song
 
 /**
  * A [ListFragment] that shows a list of [Genre]s.

app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt

@@ -35,14 +35,14 @@ import org.oxycblt.auxio.list.recycler.FastScrollRecyclerView
 import org.oxycblt.auxio.list.recycler.PlaylistViewHolder
 import org.oxycblt.auxio.list.sort.Sort
 import org.oxycblt.auxio.music.IndexingState
-import org.oxycblt.musikr.Music
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.MusicViewModel
-import org.oxycblt.musikr.Playlist
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.util.collectImmediately
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Playlist
+import org.oxycblt.musikr.Song
 
 /**
  * A [ListFragment] that shows a list of [Playlist]s.

app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt

@@ -37,14 +37,14 @@ import org.oxycblt.auxio.list.recycler.FastScrollRecyclerView
 import org.oxycblt.auxio.list.recycler.SongViewHolder
 import org.oxycblt.auxio.list.sort.Sort
 import org.oxycblt.auxio.music.IndexingState
-import org.oxycblt.musikr.Music
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.MusicViewModel
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.playback.secsToMs
 import org.oxycblt.auxio.util.collectImmediately
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Song
 
 /**
  * A [ListFragment] that shows a list of [Song]s.

app/src/main/java/org/oxycblt/auxio/image/CoverView.kt

@@ -53,18 +53,18 @@ import javax.inject.Inject
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.image.coil.RoundedRectTransformation
 import org.oxycblt.auxio.image.coil.SquareCropTransformation
-import org.oxycblt.musikr.Album
-import org.oxycblt.musikr.Artist
-import org.oxycblt.musikr.Genre
-import org.oxycblt.musikr.Playlist
-import org.oxycblt.musikr.Song
-import org.oxycblt.musikr.cover.Cover
 import org.oxycblt.auxio.ui.MaterialFader
 import org.oxycblt.auxio.ui.UISettings
 import org.oxycblt.auxio.util.getAttrColorCompat
 import org.oxycblt.auxio.util.getColorCompat
 import org.oxycblt.auxio.util.getDimenPixels
 import org.oxycblt.auxio.util.getDrawableCompat
+import org.oxycblt.musikr.Album
+import org.oxycblt.musikr.Artist
+import org.oxycblt.musikr.Genre
+import org.oxycblt.musikr.Playlist
+import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.cover.Cover
 
 /**
  * Auxio's extension of [ImageView] that enables cover art loading and playing indicator and

app/src/main/java/org/oxycblt/auxio/list/ListViewModel.kt

@@ -25,17 +25,17 @@ import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import org.oxycblt.auxio.list.menu.Menu
+import org.oxycblt.auxio.music.MusicRepository
+import org.oxycblt.auxio.playback.PlaySong
+import org.oxycblt.auxio.util.Event
+import org.oxycblt.auxio.util.MutableEvent
 import org.oxycblt.musikr.Album
 import org.oxycblt.musikr.Artist
 import org.oxycblt.musikr.Genre
 import org.oxycblt.musikr.Music
 import org.oxycblt.musikr.MusicParent
-import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.musikr.Playlist
 import org.oxycblt.musikr.Song
-import org.oxycblt.auxio.playback.PlaySong
-import org.oxycblt.auxio.util.Event
-import org.oxycblt.auxio.util.MutableEvent
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/list/menu/Menu.kt

@@ -21,13 +21,13 @@ package org.oxycblt.auxio.list.menu
 import android.os.Parcelable
 import androidx.annotation.MenuRes
 import kotlinx.parcelize.Parcelize
+import org.oxycblt.auxio.playback.PlaySong
 import org.oxycblt.musikr.Album
 import org.oxycblt.musikr.Artist
 import org.oxycblt.musikr.Genre
 import org.oxycblt.musikr.Music
 import org.oxycblt.musikr.Playlist
 import org.oxycblt.musikr.Song
-import org.oxycblt.auxio.playback.PlaySong
 
 /**
  * Command to navigate to a specific menu dialog configuration.

app/src/main/java/org/oxycblt/auxio/list/menu/MenuDialogFragmentImpl.kt

@@ -27,17 +27,17 @@ import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.DialogMenuBinding
 import org.oxycblt.auxio.detail.DetailViewModel
 import org.oxycblt.auxio.list.ListViewModel
-import org.oxycblt.musikr.Artist
-import org.oxycblt.musikr.Genre
 import org.oxycblt.auxio.music.MusicViewModel
-import org.oxycblt.musikr.Playlist
-import org.oxycblt.musikr.Song
-import org.oxycblt.musikr.resolveNames
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.util.getPlural
 import org.oxycblt.auxio.util.share
 import org.oxycblt.auxio.util.showToast
+import org.oxycblt.musikr.Artist
+import org.oxycblt.musikr.Genre
+import org.oxycblt.musikr.Playlist
+import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.resolveNames
 
 /**
  * [MenuDialogFragment] implementation for a [Song].

app/src/main/java/org/oxycblt/auxio/list/menu/MenuViewModel.kt

@@ -23,9 +23,9 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.auxio.playback.PlaySong
+import org.oxycblt.musikr.MusicParent
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/list/recycler/ViewHolders.kt

@@ -32,6 +32,9 @@ import org.oxycblt.auxio.list.PlainDivider
 import org.oxycblt.auxio.list.SelectableListListener
 import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter
 import org.oxycblt.auxio.list.adapter.SimpleDiffCallback
+import org.oxycblt.auxio.util.context
+import org.oxycblt.auxio.util.getPlural
+import org.oxycblt.auxio.util.inflater
 import org.oxycblt.musikr.Album
 import org.oxycblt.musikr.Artist
 import org.oxycblt.musikr.Genre
@@ -39,9 +42,6 @@ import org.oxycblt.musikr.Playlist
 import org.oxycblt.musikr.Song
 import org.oxycblt.musikr.areNamesTheSame
 import org.oxycblt.musikr.resolveNames
-import org.oxycblt.auxio.util.context
-import org.oxycblt.auxio.util.getPlural
-import org.oxycblt.auxio.util.inflater
 
 /**
  * A [RecyclerView.ViewHolder] that displays a [Song]. Use [from] to create an instance.

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

@@ -347,10 +347,10 @@ constructor(private val indexer: Indexer, private val musicSettings: MusicSettin
             } else {
                 Name.Known.SimpleFactory
             }
-        val uris = musicSettings.musicLocations
+        val locations = musicSettings.musicLocations
 
         val newLibrary =
-            indexer.run(uris, Interpretation(nameFactory, separators), ::emitIndexingProgress)
+            indexer.run(locations, Interpretation(nameFactory, separators), ::emitIndexingProgress)
 
         emitIndexingCompletion(null)
 

app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt

@@ -69,7 +69,8 @@ constructor(
         set(value) {
             sharedPreferences.edit {
                 putStringSet(
-                    getString(R.string.set_key_music_locations), value.map { it.toString() }.toSet())
+                    getString(R.string.set_key_music_locations),
+                    value.map { it.toString() }.toSet())
                 apply()
             }
         }

app/src/main/java/org/oxycblt/auxio/music/MusicViewModel.kt

@@ -29,8 +29,6 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.list.ListSettings
-import org.oxycblt.musikr.playlist.ExportConfig
-import org.oxycblt.musikr.playlist.ExternalPlaylistManager
 import org.oxycblt.auxio.util.Event
 import org.oxycblt.auxio.util.MutableEvent
 import org.oxycblt.musikr.Album
@@ -38,6 +36,8 @@ import org.oxycblt.musikr.Artist
 import org.oxycblt.musikr.Genre
 import org.oxycblt.musikr.Playlist
 import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.playlist.ExportConfig
+import org.oxycblt.musikr.playlist.ExternalPlaylistManager
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/music/decision/AddToPlaylistDialog.kt

@@ -33,10 +33,10 @@ import org.oxycblt.auxio.databinding.DialogMusicChoicesBinding
 import org.oxycblt.auxio.list.ClickableListListener
 import org.oxycblt.auxio.music.MusicViewModel
 import org.oxycblt.auxio.music.PlaylistDecision
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.navigateSafe
+import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/music/decision/DeletePlaylistDialog.kt

@@ -29,10 +29,10 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.DialogDeletePlaylistBinding
 import org.oxycblt.auxio.music.MusicViewModel
-import org.oxycblt.musikr.Playlist
 import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.unlikelyToBeNull
+import org.oxycblt.musikr.Playlist
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/music/decision/ExportPlaylistDialog.kt

@@ -31,12 +31,12 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.DialogPlaylistExportBinding
 import org.oxycblt.auxio.music.MusicViewModel
-import org.oxycblt.musikr.Playlist
-import org.oxycblt.musikr.playlist.ExportConfig
-import org.oxycblt.musikr.playlist.m3u.M3U
 import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.unlikelyToBeNull
+import org.oxycblt.musikr.Playlist
+import org.oxycblt.musikr.playlist.ExportConfig
+import org.oxycblt.musikr.playlist.m3u.M3U
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/music/decision/PlaylistPickerViewModel.kt

@@ -27,10 +27,10 @@ import kotlinx.coroutines.flow.StateFlow
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.list.sort.Sort
-import org.oxycblt.musikr.Music
 import org.oxycblt.auxio.music.MusicRepository
-import org.oxycblt.musikr.Playlist
 import org.oxycblt.auxio.music.PlaylistDecision
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.Playlist
 import org.oxycblt.musikr.Song
 import org.oxycblt.musikr.playlist.ExportConfig
 import timber.log.Timber as L

app/src/main/java/org/oxycblt/auxio/music/locations/LocationAdapter.kt

@@ -15,16 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-
+ 
 package org.oxycblt.auxio.music.locations
 
-import android.net.Uri
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import org.oxycblt.auxio.databinding.ItemMusicLocationBinding
 import org.oxycblt.auxio.list.recycler.DialogRecyclerView
-import org.oxycblt.musikr.fs.Path
 import org.oxycblt.auxio.util.context
 import org.oxycblt.auxio.util.inflater
 import org.oxycblt.musikr.fs.MusicLocation

app/src/main/java/org/oxycblt/auxio/music/locations/MusicSourcesDialog.kt

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-
+ 
 package org.oxycblt.auxio.music.locations
 
 import android.content.ActivityNotFoundException
@@ -50,10 +50,8 @@ class MusicSourcesDialog :
     ViewBindingMaterialDialogFragment<DialogMusicLocationsBinding>(), LocationAdapter.Listener {
     private val locationAdapter = LocationAdapter(this)
     private var openDocumentTreeLauncher: ActivityResultLauncher<Uri?>? = null
-    @Inject
+    @Inject lateinit var musicLocationFactory: MusicLocation.Factory
-    lateinit var musicLocationFactory: MusicLocation.Factory
+    @Inject lateinit var musicSettings: MusicSettings
-    @Inject
-    lateinit var musicSettings: MusicSettings
 
     override fun onCreateBinding(inflater: LayoutInflater) =
         DialogMusicLocationsBinding.inflate(inflater)
@@ -77,9 +75,7 @@ class MusicSourcesDialog :
     ) {
         openDocumentTreeLauncher =
             registerForActivityResult(
-                ActivityResultContracts.OpenDocumentTree(),
+                ActivityResultContracts.OpenDocumentTree(), ::addDocumentTreeUriToDirs)
-                ::addDocumentTreeUriToDirs
-            )
 
         binding.locationsAdd.apply {
             ViewCompat.setTooltipText(this, contentDescription)
@@ -107,8 +103,7 @@ class MusicSourcesDialog :
         val locations =
             savedInstanceState?.getStringArrayList(KEY_PENDING_LOCATIONS)?.mapNotNull {
                 musicLocationFactory.existing(Uri.parse(it))
-            }
+            } ?: musicSettings.musicLocations
-                ?: musicSettings.musicLocations
 
         locationAdapter.addAll(locations)
         requireBinding().locationsEmpty.isVisible = locations.isEmpty()
@@ -117,8 +112,7 @@ class MusicSourcesDialog :
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putStringArrayList(
-            KEY_PENDING_LOCATIONS, ArrayList(locationAdapter.locations.map { it.uri.toString() })
+            KEY_PENDING_LOCATIONS, ArrayList(locationAdapter.locations.map { it.uri.toString() }))
-        )
     }
 
     override fun onDestroyBinding(binding: DialogMusicLocationsBinding) {
@@ -132,8 +126,7 @@ class MusicSourcesDialog :
         requireBinding().locationsEmpty.isVisible = locationAdapter.locations.isEmpty()
     }
 
-    @Inject
+    @Inject lateinit var contentResolver: ContentResolver
-    lateinit var contentResolver: ContentResolver
 
     /**
      * Add a Document Tree [Uri] chosen by the user to the current [MusicLocation]s.

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

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

app/src/main/java/org/oxycblt/auxio/music/service/IndexerNotifications.kt

@@ -25,8 +25,8 @@ import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.ForegroundServiceNotification
 import org.oxycblt.auxio.IntegerTable
 import org.oxycblt.auxio.R
-import org.oxycblt.musikr.IndexingProgress
 import org.oxycblt.auxio.util.newMainPendingIntent
+import org.oxycblt.musikr.IndexingProgress
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/music/service/IndexingHolder.kt

@@ -30,11 +30,11 @@ import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.ForegroundListener
 import org.oxycblt.auxio.ForegroundServiceNotification
 import org.oxycblt.auxio.music.IndexingState
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.auxio.music.MusicSettings
 import org.oxycblt.auxio.playback.state.PlaybackStateManager
 import org.oxycblt.auxio.util.getSystemServiceCompat
+import org.oxycblt.musikr.MusicParent
 import timber.log.Timber as L
 
 class IndexingHolder

app/src/main/java/org/oxycblt/auxio/music/service/MediaItemTranslation.kt

@@ -27,6 +27,8 @@ import androidx.annotation.StringRes
 import androidx.media.utils.MediaConstants
 import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.R
+import org.oxycblt.auxio.playback.formatDurationDs
+import org.oxycblt.auxio.util.getPlural
 import org.oxycblt.musikr.Album
 import org.oxycblt.musikr.Artist
 import org.oxycblt.musikr.Genre
@@ -35,8 +37,6 @@ import org.oxycblt.musikr.MusicParent
 import org.oxycblt.musikr.Playlist
 import org.oxycblt.musikr.Song
 import org.oxycblt.musikr.resolveNames
-import org.oxycblt.auxio.playback.formatDurationDs
-import org.oxycblt.auxio.util.getPlural
 
 sealed interface MediaSessionUID {
     data class Tab(val node: TabNode) : MediaSessionUID {

app/src/main/java/org/oxycblt/auxio/music/service/MusicBrowser.kt

@@ -27,16 +27,16 @@ import org.oxycblt.auxio.detail.DetailGenerator
 import org.oxycblt.auxio.detail.DetailSection
 import org.oxycblt.auxio.home.HomeGenerator
 import org.oxycblt.auxio.list.adapter.UpdateInstructions
+import org.oxycblt.auxio.music.MusicRepository
+import org.oxycblt.auxio.music.MusicType
+import org.oxycblt.auxio.search.SearchEngine
 import org.oxycblt.musikr.Album
 import org.oxycblt.musikr.Artist
 import org.oxycblt.musikr.Genre
 import org.oxycblt.musikr.Music
-import org.oxycblt.auxio.music.MusicRepository
-import org.oxycblt.auxio.music.MusicType
 import org.oxycblt.musikr.Playlist
 import org.oxycblt.musikr.Song
 import org.oxycblt.musikr.tag.resolveNumber
-import org.oxycblt.auxio.search.SearchEngine
 
 class MusicBrowser
 private constructor(

app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarFragment.kt

@@ -26,13 +26,13 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.FragmentPlaybackBarBinding
 import org.oxycblt.auxio.detail.DetailViewModel
-import org.oxycblt.musikr.Song
-import org.oxycblt.musikr.resolveNames
 import org.oxycblt.auxio.playback.state.RepeatMode
 import org.oxycblt.auxio.ui.ViewBindingFragment
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.getAttrColorCompat
 import org.oxycblt.auxio.util.getColorCompat
+import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.resolveNames
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt

@@ -35,9 +35,6 @@ import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.FragmentPlaybackPanelBinding
 import org.oxycblt.auxio.detail.DetailViewModel
 import org.oxycblt.auxio.list.ListViewModel
-import org.oxycblt.musikr.MusicParent
-import org.oxycblt.musikr.Song
-import org.oxycblt.musikr.resolveNames
 import org.oxycblt.auxio.playback.state.RepeatMode
 import org.oxycblt.auxio.playback.ui.StyledSeekBar
 import org.oxycblt.auxio.playback.ui.SwipeCoverView
@@ -45,6 +42,9 @@ import org.oxycblt.auxio.ui.ViewBindingFragment
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.showToast
 import org.oxycblt.auxio.util.systemBarInsetsCompat
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.resolveNames
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt

@@ -28,12 +28,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import org.oxycblt.auxio.list.ListSettings
-import org.oxycblt.musikr.Album
-import org.oxycblt.musikr.Artist
-import org.oxycblt.musikr.Genre
-import org.oxycblt.musikr.MusicParent
-import org.oxycblt.musikr.Playlist
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.state.DeferredPlayback
 import org.oxycblt.auxio.playback.state.PlaybackCommand
 import org.oxycblt.auxio.playback.state.PlaybackStateManager
@@ -43,6 +37,12 @@ import org.oxycblt.auxio.playback.state.RepeatMode
 import org.oxycblt.auxio.playback.state.ShuffleMode
 import org.oxycblt.auxio.util.Event
 import org.oxycblt.auxio.util.MutableEvent
+import org.oxycblt.musikr.Album
+import org.oxycblt.musikr.Artist
+import org.oxycblt.musikr.Genre
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Playlist
+import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/playback/decision/ArtistPlaybackChoiceAdapter.kt

@@ -25,9 +25,9 @@ import org.oxycblt.auxio.list.ClickableListListener
 import org.oxycblt.auxio.list.adapter.FlexibleListAdapter
 import org.oxycblt.auxio.list.adapter.SimpleDiffCallback
 import org.oxycblt.auxio.list.recycler.DialogRecyclerView
-import org.oxycblt.musikr.Artist
 import org.oxycblt.auxio.util.context
 import org.oxycblt.auxio.util.inflater
+import org.oxycblt.musikr.Artist
 
 /**
  * A [FlexibleListAdapter] that displays a list of [Artist] playback choices, for use with

app/src/main/java/org/oxycblt/auxio/playback/decision/GenrePlaybackChoiceAdapter.kt

@@ -25,9 +25,9 @@ import org.oxycblt.auxio.list.ClickableListListener
 import org.oxycblt.auxio.list.adapter.FlexibleListAdapter
 import org.oxycblt.auxio.list.adapter.SimpleDiffCallback
 import org.oxycblt.auxio.list.recycler.DialogRecyclerView
-import org.oxycblt.musikr.Genre
 import org.oxycblt.auxio.util.context
 import org.oxycblt.auxio.util.inflater
+import org.oxycblt.musikr.Genre
 
 /**
  * A [FlexibleListAdapter] that displays a list of [Genre] playback choices, for use with

app/src/main/java/org/oxycblt/auxio/playback/decision/PlayFromArtistDialog.kt

@@ -31,12 +31,12 @@ import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.DialogMusicChoicesBinding
 import org.oxycblt.auxio.list.ClickableListListener
 import org.oxycblt.auxio.list.adapter.UpdateInstructions
-import org.oxycblt.musikr.Artist
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.unlikelyToBeNull
+import org.oxycblt.musikr.Artist
+import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/playback/decision/PlayFromGenreDialog.kt

@@ -31,12 +31,12 @@ import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.DialogMusicChoicesBinding
 import org.oxycblt.auxio.list.ClickableListListener
 import org.oxycblt.auxio.list.adapter.UpdateInstructions
-import org.oxycblt.musikr.Genre
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.unlikelyToBeNull
+import org.oxycblt.musikr.Genre
+import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/playback/decision/PlaybackPickerViewModel.kt

@@ -23,9 +23,9 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.musikr.Artist
 import org.oxycblt.musikr.Music
-import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 

app/src/main/java/org/oxycblt/auxio/playback/persist/PersistenceDatabase.kt

@@ -28,8 +28,8 @@ import androidx.room.Query
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import androidx.room.migration.Migration
-import org.oxycblt.musikr.Music
 import org.oxycblt.auxio.playback.state.RepeatMode
+import org.oxycblt.musikr.Music
 
 /**
  * Provides raw access to the database storing the persisted playback state.

app/src/main/java/org/oxycblt/auxio/playback/persist/PersistenceRepository.kt

@@ -19,9 +19,9 @@
 package org.oxycblt.auxio.playback.persist
 
 import javax.inject.Inject
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.auxio.playback.state.PlaybackStateManager
+import org.oxycblt.musikr.MusicParent
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt

@@ -32,11 +32,11 @@ import org.oxycblt.auxio.list.adapter.FlexibleListAdapter
 import org.oxycblt.auxio.list.adapter.PlayingIndicatorAdapter
 import org.oxycblt.auxio.list.recycler.MaterialDragCallback
 import org.oxycblt.auxio.list.recycler.SongViewHolder
-import org.oxycblt.musikr.Song
-import org.oxycblt.musikr.resolveNames
 import org.oxycblt.auxio.util.context
 import org.oxycblt.auxio.util.getAttrColorCompat
 import org.oxycblt.auxio.util.inflater
+import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.resolveNames
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt

@@ -30,10 +30,10 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlin.math.min
 import org.oxycblt.auxio.databinding.FragmentQueueBinding
 import org.oxycblt.auxio.list.EditClickListListener
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.ui.ViewBindingFragment
 import org.oxycblt.auxio.util.collectImmediately
+import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/playback/queue/QueueViewModel.kt

@@ -24,12 +24,12 @@ import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import org.oxycblt.auxio.list.adapter.UpdateInstructions
-import org.oxycblt.musikr.MusicParent
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.state.PlaybackStateManager
 import org.oxycblt.auxio.playback.state.QueueChange
 import org.oxycblt.auxio.util.Event
 import org.oxycblt.auxio.util.MutableEvent
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainAudioProcessor.kt

@@ -26,12 +26,12 @@ import androidx.media3.common.audio.BaseAudioProcessor
 import java.nio.ByteBuffer
 import javax.inject.Inject
 import kotlin.math.pow
-import org.oxycblt.musikr.Album
-import org.oxycblt.musikr.MusicParent
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.PlaybackSettings
 import org.oxycblt.auxio.playback.state.PlaybackStateManager
 import org.oxycblt.auxio.playback.state.QueueChange
+import org.oxycblt.musikr.Album
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/playback/service/ExoPlaybackStateHolder.kt

@@ -43,9 +43,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.yield
 import org.oxycblt.auxio.image.ImageSettings
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.MusicRepository
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.PlaybackSettings
 import org.oxycblt.auxio.playback.msToSecs
 import org.oxycblt.auxio.playback.persist.PersistenceRepository
@@ -59,6 +57,8 @@ import org.oxycblt.auxio.playback.state.RawQueue
 import org.oxycblt.auxio.playback.state.RepeatMode
 import org.oxycblt.auxio.playback.state.ShuffleMode
 import org.oxycblt.auxio.playback.state.StateAck
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 
 class ExoPlaybackStateHolder(

app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt

@@ -36,9 +36,6 @@ import org.oxycblt.auxio.IntegerTable
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.image.BitmapProvider
 import org.oxycblt.auxio.image.ImageSettings
-import org.oxycblt.musikr.MusicParent
-import org.oxycblt.musikr.Song
-import org.oxycblt.musikr.resolveNames
 import org.oxycblt.auxio.music.service.MediaSessionUID
 import org.oxycblt.auxio.music.service.toMediaDescription
 import org.oxycblt.auxio.playback.ActionMode
@@ -49,6 +46,9 @@ import org.oxycblt.auxio.playback.state.QueueChange
 import org.oxycblt.auxio.playback.state.RepeatMode
 import org.oxycblt.auxio.util.newBroadcastPendingIntent
 import org.oxycblt.auxio.util.newMainPendingIntent
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.resolveNames
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionInterface.kt

@@ -29,22 +29,22 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import org.apache.commons.text.similarity.JaroWinklerSimilarity
 import org.oxycblt.auxio.BuildConfig
+import org.oxycblt.auxio.music.MusicRepository
+import org.oxycblt.auxio.music.service.MediaSessionUID
+import org.oxycblt.auxio.music.service.MusicBrowser
+import org.oxycblt.auxio.playback.state.PlaybackCommand
+import org.oxycblt.auxio.playback.state.PlaybackStateManager
+import org.oxycblt.auxio.playback.state.RepeatMode
+import org.oxycblt.auxio.playback.state.ShuffleMode
 import org.oxycblt.musikr.Album
 import org.oxycblt.musikr.Artist
 import org.oxycblt.musikr.Genre
 import org.oxycblt.musikr.Library
 import org.oxycblt.musikr.Music
 import org.oxycblt.musikr.MusicParent
-import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.musikr.Playlist
 import org.oxycblt.musikr.Song
-import org.oxycblt.auxio.music.service.MediaSessionUID
-import org.oxycblt.auxio.music.service.MusicBrowser
 import org.oxycblt.musikr.tag.Name
-import org.oxycblt.auxio.playback.state.PlaybackCommand
-import org.oxycblt.auxio.playback.state.PlaybackStateManager
-import org.oxycblt.auxio.playback.state.RepeatMode
-import org.oxycblt.auxio.playback.state.ShuffleMode
 import timber.log.Timber as L
 
 class MediaSessionInterface

app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackCommand.kt

@@ -21,14 +21,14 @@ package org.oxycblt.auxio.playback.state
 import javax.inject.Inject
 import org.oxycblt.auxio.list.ListSettings
 import org.oxycblt.auxio.list.sort.Sort
+import org.oxycblt.auxio.music.MusicRepository
+import org.oxycblt.auxio.playback.PlaybackSettings
 import org.oxycblt.musikr.Album
 import org.oxycblt.musikr.Artist
 import org.oxycblt.musikr.Genre
 import org.oxycblt.musikr.MusicParent
-import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.musikr.Playlist
 import org.oxycblt.musikr.Song
-import org.oxycblt.auxio.playback.PlaybackSettings
 
 /**
  * A playback command that can be passed to [PlaybackStateManager] to start new playback.

app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt

@@ -21,10 +21,10 @@ package org.oxycblt.auxio.playback.state
 import javax.inject.Inject
 import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.list.adapter.UpdateInstructions
+import org.oxycblt.auxio.playback.state.PlaybackStateManager.Listener
 import org.oxycblt.musikr.Music
 import org.oxycblt.musikr.MusicParent
 import org.oxycblt.musikr.Song
-import org.oxycblt.auxio.playback.state.PlaybackStateManager.Listener
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt

@@ -44,17 +44,9 @@ import org.oxycblt.auxio.list.ListViewModel
 import org.oxycblt.auxio.list.PlainDivider
 import org.oxycblt.auxio.list.PlainHeader
 import org.oxycblt.auxio.list.menu.Menu
-import org.oxycblt.musikr.Album
-import org.oxycblt.musikr.Artist
-import org.oxycblt.musikr.Genre
-import org.oxycblt.musikr.Music
-import org.oxycblt.musikr.MusicParent
 import org.oxycblt.auxio.music.MusicViewModel
-import org.oxycblt.musikr.Playlist
 import org.oxycblt.auxio.music.PlaylistDecision
 import org.oxycblt.auxio.music.PlaylistMessage
-import org.oxycblt.musikr.Song
-import org.oxycblt.musikr.playlist.m3u.M3U
 import org.oxycblt.auxio.playback.PlaybackDecision
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.util.collect
@@ -64,6 +56,14 @@ import org.oxycblt.auxio.util.getSystemServiceCompat
 import org.oxycblt.auxio.util.navigateSafe
 import org.oxycblt.auxio.util.setFullWidthLookup
 import org.oxycblt.auxio.util.showToast
+import org.oxycblt.musikr.Album
+import org.oxycblt.musikr.Artist
+import org.oxycblt.musikr.Genre
+import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Playlist
+import org.oxycblt.musikr.Song
+import org.oxycblt.musikr.playlist.m3u.M3U
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/search/SearchViewModel.kt

@@ -33,12 +33,12 @@ import org.oxycblt.auxio.list.BasicHeader
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.list.PlainDivider
 import org.oxycblt.auxio.list.sort.Sort
-import org.oxycblt.musikr.Library
 import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.auxio.music.MusicType
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.PlaySong
 import org.oxycblt.auxio.playback.PlaybackSettings
+import org.oxycblt.musikr.Library
+import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt

@@ -30,14 +30,14 @@ import org.oxycblt.auxio.image.BitmapProvider
 import org.oxycblt.auxio.image.ImageSettings
 import org.oxycblt.auxio.image.coil.RoundedRectTransformation
 import org.oxycblt.auxio.image.coil.SquareCropTransformation
-import org.oxycblt.musikr.MusicParent
-import org.oxycblt.musikr.Song
 import org.oxycblt.auxio.playback.state.PlaybackStateManager
 import org.oxycblt.auxio.playback.state.Progression
 import org.oxycblt.auxio.playback.state.QueueChange
 import org.oxycblt.auxio.playback.state.RepeatMode
 import org.oxycblt.auxio.ui.UISettings
 import org.oxycblt.auxio.util.getDimenPixels
+import org.oxycblt.musikr.MusicParent
+import org.oxycblt.musikr.Song
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt

@@ -30,12 +30,12 @@ import android.view.View
 import android.widget.RemoteViews
 import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.R
-import org.oxycblt.musikr.resolveNames
 import org.oxycblt.auxio.playback.service.PlaybackActions
 import org.oxycblt.auxio.playback.state.RepeatMode
 import org.oxycblt.auxio.ui.UISettings
 import org.oxycblt.auxio.ui.UISettingsImpl
 import org.oxycblt.auxio.util.newBroadcastPendingIntent
+import org.oxycblt.musikr.resolveNames
 import timber.log.Timber as L
 
 /**

app/src/main/java/org/oxycblt/musikr/Indexer.kt

@@ -18,7 +18,6 @@
  
 package org.oxycblt.musikr
 
-import android.net.Uri
 import javax.inject.Inject
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.coroutineScope
@@ -35,7 +34,7 @@ import org.oxycblt.musikr.tag.Interpretation
 
 interface Indexer {
     suspend fun run(
-        locations: MusicLocation,
+        locations: List<MusicLocation>,
         interpretation: Interpretation,
         onProgress: suspend (IndexingProgress) -> Unit = {}
     ): MutableLibrary
@@ -60,14 +59,14 @@ constructor(
     private val evaluateStep: EvaluateStep
 ) : Indexer {
     override suspend fun run(
-        locations: MusicLocation,
+        locations: List<MusicLocation>,
         interpretation: Interpretation,
         onProgress: suspend (IndexingProgress) -> Unit
     ) = coroutineScope {
         var exploredCount = 0
         val explored =
             exploreStep
-                .explore(uris)
+                .explore(locations)
                 .buffer(Channel.UNLIMITED)
                 .onStart { onProgress(IndexingProgress.Songs(0, 0)) }
                 .onEach { onProgress(IndexingProgress.Songs(0, ++exploredCount)) }

app/src/main/java/org/oxycblt/musikr/MimeType.kt

@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2024 Auxio Project
+ * MimeType.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 <https://www.gnu.org/licenses/>.
+ */
+ 
 package org.oxycblt.musikr
 
 import android.content.Context
@@ -81,4 +99,4 @@ data class MimeType(val fromExtension: String, val fromFormat: String?) {
             MimeTypeMap.getSingleton().getExtensionFromMimeType(fromExtension)?.uppercase()
         }
     }
-}
+}

app/src/main/java/org/oxycblt/musikr/Music.kt

@@ -29,15 +29,15 @@ import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.music.MusicType
+import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment
+import org.oxycblt.auxio.util.concatLocalized
+import org.oxycblt.auxio.util.toUuidOrNull
 import org.oxycblt.musikr.cover.Cover
 import org.oxycblt.musikr.fs.Path
 import org.oxycblt.musikr.tag.Date
 import org.oxycblt.musikr.tag.Disc
 import org.oxycblt.musikr.tag.Name
 import org.oxycblt.musikr.tag.ReleaseType
-import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment
-import org.oxycblt.auxio.util.concatLocalized
-import org.oxycblt.auxio.util.toUuidOrNull
 
 interface Library {
     val songs: Collection<Song>

app/src/main/java/org/oxycblt/musikr/cover/CoverCache.kt

@@ -44,8 +44,7 @@ constructor(
         val id = coverIdentifier.identify(data)
         coverFiles.write(id, data)
         storedCoversDao.setStoredCover(
-            StoredCover(uid = cover.uid, lastModified = cover.lastModified, coverId = id)
+            StoredCover(uid = cover.uid, lastModified = cover.lastModified, coverId = id))
-        )
         return coverFiles.read(id)
     }
 }

app/src/main/java/org/oxycblt/musikr/fs/DeviceFiles.kt

@@ -31,8 +31,6 @@ import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flatMapMerge
 import kotlinx.coroutines.flow.flattenMerge
 import kotlinx.coroutines.flow.flow
-import org.oxycblt.musikr.fs.path.DocumentPathFactory
-import timber.log.Timber
 
 interface DeviceFiles {
     fun explore(locations: Flow<MusicLocation>): Flow<DeviceFile>
@@ -47,11 +45,8 @@ data class DeviceFile(
 )
 
 @OptIn(ExperimentalCoroutinesApi::class)
-class DeviceFilesImpl
+class DeviceFilesImpl @Inject constructor(@ApplicationContext private val context: Context) :
-@Inject
+    DeviceFiles {
-constructor(
-    @ApplicationContext private val context: Context
-) : DeviceFiles {
     private val contentResolver = context.contentResolverSafe
 
     override fun explore(locations: Flow<MusicLocation>): Flow<DeviceFile> =
@@ -71,8 +66,7 @@ constructor(
     ): Flow<DeviceFile> = flow {
         contentResolver.useQuery(
             DocumentsContract.buildChildDocumentsUriUsingTree(rootUri, treeDocumentId),
-            PROJECTION
+            PROJECTION) { cursor ->
-        ) { cursor ->
                 val childUriIndex =
                     cursor.getColumnIndexOrThrow(DocumentsContract.Document.COLUMN_DOCUMENT_ID)
                 val displayNameIndex =
@@ -104,8 +98,7 @@ constructor(
                                 mimeType,
                                 newPath,
                                 size,
-                                lastModified)
+                                lastModified))
-                        )
                     }
                 }
                 emitAll(recursive.asFlow().flattenMerge())

app/src/main/java/org/oxycblt/musikr/fs/FsModule.kt

@@ -20,19 +20,12 @@ package org.oxycblt.musikr.fs
 
 import android.content.ContentResolver
 import android.content.Context
-import android.os.storage.StorageManager
 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.path.DocumentPathFactory
-import org.oxycblt.musikr.fs.path.DocumentPathFactoryImpl
-import org.oxycblt.musikr.fs.path.MediaStorePathInterpreter
-import org.oxycblt.auxio.util.getSystemServiceCompat
-import org.oxycblt.musikr.fs.path.VolumeManager
-import org.oxycblt.musikr.fs.path.VolumeManagerImpl
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -47,5 +40,8 @@ class FsProvidesModule {
 interface FsBindsModule {
     @Binds fun deviceFiles(deviceFilesImpl: DeviceFilesImpl): DeviceFiles
 
-    @Binds fun musicLocationFactory(musicLocationFactoryImpl: MusicLocationFactoryImpl): MusicLocation.Factory
+    @Binds
+    fun musicLocationFactory(
+        musicLocationFactoryImpl: MusicLocationFactoryImpl
+    ): MusicLocation.Factory
 }

app/src/main/java/org/oxycblt/musikr/fs/MusicLocation.kt

@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2024 Auxio Project
+ * MusicLocation.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 <https://www.gnu.org/licenses/>.
+ */
+ 
 package org.oxycblt.musikr.fs
 
 import android.content.Context
@@ -5,20 +23,21 @@ import android.content.Intent
 import android.net.Uri
 import android.provider.DocumentsContract
 import dagger.hilt.android.qualifiers.ApplicationContext
-import org.oxycblt.musikr.fs.path.DocumentPathFactory
-import org.oxycblt.musikr.fs.path.VolumeManager
 import javax.inject.Inject
+import org.oxycblt.musikr.fs.path.DocumentPathFactory
 
 class MusicLocation internal constructor(val uri: Uri, val path: Path) {
     override fun equals(other: Any?) =
         other is MusicLocation && uri == other.uri && path == other.path
 
     override fun hashCode() = 31 * uri.hashCode() + path.hashCode()
+
     override fun toString(): String {
-        val volumeId = when (path.volume) {
+        val volumeId =
-            is Volume.Internal -> VOLUME_INTERNAL
+            when (path.volume) {
-            is Volume.External -> path.volume.id
+                is Volume.Internal -> VOLUME_INTERNAL
-        }
+                is Volume.External -> path.volume.id
+            }
         return "$uri=${volumeId}:${path.components.unixString}"
     }
 
@@ -29,32 +48,37 @@ class MusicLocation internal constructor(val uri: Uri, val path: Path) {
     }
 }
 
-class MusicLocationFactoryImpl @Inject constructor(
+class MusicLocationFactoryImpl
+@Inject
+constructor(
     @ApplicationContext private val context: Context,
     private val documentPathFactory: DocumentPathFactory
 ) : MusicLocation.Factory {
     override fun new(uri: Uri): MusicLocation? {
         if (!DocumentsContract.isTreeUri(uri)) return null
         val path = documentPathFactory.unpackDocumentTreeUri(uri) ?: return null
-        val notPersisted = context.contentResolverSafe.persistedUriPermissions
+        val notPersisted =
-            .none { it.uri == uri && it.isReadPermission && it.isWritePermission }
+            context.contentResolverSafe.persistedUriPermissions.none {
+                it.uri == uri && it.isReadPermission && it.isWritePermission
+            }
         if (notPersisted) {
             context.contentResolverSafe.takePersistableUriPermission(
                 uri,
-                Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-            )
         }
         return MusicLocation(uri, path)
     }
 
     override fun existing(uri: Uri): MusicLocation? {
         if (!DocumentsContract.isTreeUri(uri)) return null
-        val notPersisted = context.contentResolverSafe.persistedUriPermissions
+        val notPersisted =
-            .none { it.uri == uri && it.isReadPermission && it.isWritePermission }
+            context.contentResolverSafe.persistedUriPermissions.none {
+                it.uri == uri && it.isReadPermission && it.isWritePermission
+            }
         if (notPersisted) return null
         val path = documentPathFactory.unpackDocumentTreeUri(uri) ?: return null
         return MusicLocation(uri, path)
     }
 }
 
-private const val VOLUME_INTERNAL = "internal"
+private const val VOLUME_INTERNAL = "internal"

app/src/main/java/org/oxycblt/musikr/fs/Path.kt

@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2024 Auxio Project
+ * Path.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 <https://www.gnu.org/licenses/>.
+ */
+ 
 package org.oxycblt.musikr.fs
 
 import android.content.Context
@@ -159,4 +177,4 @@ value class Components private constructor(val components: List<String>) {
 
         private fun String.trimSlashes() = trimStart(File.separatorChar).trimEnd(File.separatorChar)
     }
-}
+}

app/src/main/java/org/oxycblt/musikr/fs/path/PathModule.kt

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2024 Auxio Project
- * FsModule.kt is part of Auxio.
+ * PathModule.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
@@ -15,10 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-
+ 
 package org.oxycblt.musikr.fs.path
 
-import android.content.ContentResolver
 import android.content.Context
 import android.os.storage.StorageManager
 import dagger.Binds
@@ -27,12 +26,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import org.oxycblt.musikr.fs.path.DocumentPathFactory
-import org.oxycblt.musikr.fs.path.DocumentPathFactoryImpl
-import org.oxycblt.musikr.fs.path.MediaStorePathInterpreter
 import org.oxycblt.auxio.util.getSystemServiceCompat
-import org.oxycblt.musikr.fs.path.VolumeManager
-import org.oxycblt.musikr.fs.path.VolumeManagerImpl
 
 @Module
 @InstallIn(SingletonComponent::class)

app/src/main/java/org/oxycblt/musikr/fs/path/VolumeManager.kt

@@ -1,8 +1,27 @@
+/*
+ * Copyright (c) 2024 Auxio Project
+ * VolumeManager.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 <https://www.gnu.org/licenses/>.
+ */
+ 
 package org.oxycblt.musikr.fs.path
 
 import android.content.Context
 import android.os.storage.StorageManager
 import android.os.storage.StorageVolume
+import javax.inject.Inject
 import org.oxycblt.musikr.fs.Components
 import org.oxycblt.musikr.fs.Volume
 import org.oxycblt.musikr.fs.directoryCompat
@@ -11,7 +30,6 @@ import org.oxycblt.musikr.fs.isInternalCompat
 import org.oxycblt.musikr.fs.mediaStoreVolumeNameCompat
 import org.oxycblt.musikr.fs.storageVolumesCompat
 import org.oxycblt.musikr.fs.uuidCompat
-import javax.inject.Inject
 
 /** A wrapper around [StorageManager] that provides instances of the [Volume] interface. */
 interface VolumeManager {
@@ -66,4 +84,4 @@ class VolumeManagerImpl @Inject constructor(private val storageManager: StorageM
 
         override fun resolveName(context: Context) = storageVolume.getDescriptionCompat(context)
     }
-}
+}

app/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt

@@ -19,12 +19,12 @@
 package org.oxycblt.musikr.graph
 
 import javax.inject.Inject
+import org.oxycblt.auxio.util.unlikelyToBeNull
 import org.oxycblt.musikr.Music
 import org.oxycblt.musikr.tag.interpret.PreAlbum
 import org.oxycblt.musikr.tag.interpret.PreArtist
 import org.oxycblt.musikr.tag.interpret.PreGenre
 import org.oxycblt.musikr.tag.interpret.PreSong
-import org.oxycblt.auxio.util.unlikelyToBeNull
 import timber.log.Timber as L
 
 data class MusicGraph(

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.Song
 import org.oxycblt.musikr.MimeType
+import org.oxycblt.musikr.Song
 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))
-        )
     }
 }

app/src/main/java/org/oxycblt/musikr/metadata/ReusableMetadataRetriever.kt

@@ -110,8 +110,7 @@ constructor(private val mediaSourceFactory: MediaSource.Factory) :
                 job = MetadataJob(data, mediaSourceCaller)
 
                 mediaSourceHandler.sendEmptyMessageDelayed(
-                    MESSAGE_CHECK_FAILURE, /* delayMs= */ CHECK_INTERVAL_MS
+                    MESSAGE_CHECK_FAILURE, /* delayMs= */ CHECK_INTERVAL_MS)
-                )
 
                 return true
             }

app/src/main/java/org/oxycblt/musikr/model/DeviceMusicImpl.kt

@@ -18,11 +18,12 @@
  
 package org.oxycblt.musikr.model
 
+import org.oxycblt.auxio.music.MusicType
+import org.oxycblt.auxio.util.update
 import org.oxycblt.musikr.Album
 import org.oxycblt.musikr.Artist
 import org.oxycblt.musikr.Genre
 import org.oxycblt.musikr.Music
-import org.oxycblt.auxio.music.MusicType
 import org.oxycblt.musikr.Song
 import org.oxycblt.musikr.cover.Cover
 import org.oxycblt.musikr.tag.Date
@@ -30,7 +31,6 @@ import org.oxycblt.musikr.tag.interpret.PreAlbum
 import org.oxycblt.musikr.tag.interpret.PreArtist
 import org.oxycblt.musikr.tag.interpret.PreGenre
 import org.oxycblt.musikr.tag.interpret.PreSong
-import org.oxycblt.auxio.util.update
 
 interface SongHandle {
     val preSong: PreSong

app/src/main/java/org/oxycblt/musikr/pipeline/ExploreStep.kt

@@ -18,7 +18,6 @@
  
 package org.oxycblt.musikr.pipeline
 
-import android.net.Uri
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
@@ -27,16 +26,17 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.mapNotNull
 import org.oxycblt.musikr.fs.DeviceFile
 import org.oxycblt.musikr.fs.DeviceFiles
+import org.oxycblt.musikr.fs.MusicLocation
 import org.oxycblt.musikr.playlist.m3u.M3U
 
 interface ExploreStep {
-    fun explore(uris: List<Uri>): Flow<ExploreNode>
+    fun explore(locations: List<MusicLocation>): Flow<ExploreNode>
 }
 
 class ExploreStepImpl @Inject constructor(private val deviceFiles: DeviceFiles) : ExploreStep {
-    override fun explore(uris: List<Uri>) =
+    override fun explore(locations: List<MusicLocation>) =
         deviceFiles
-            .explore(uris.asFlow())
+            .explore(locations.asFlow())
             .mapNotNull {
                 when {
                     it.mimeType == M3U.MIME_TYPE -> null

app/src/main/java/org/oxycblt/musikr/playlist/m3u/M3U.kt

@@ -26,8 +26,8 @@ import java.io.InputStream
 import java.io.InputStreamReader
 import java.io.OutputStream
 import javax.inject.Inject
+import org.oxycblt.auxio.util.unlikelyToBeNull
 import org.oxycblt.musikr.Playlist
-import org.oxycblt.musikr.resolveNames
 import org.oxycblt.musikr.fs.Components
 import org.oxycblt.musikr.fs.Path
 import org.oxycblt.musikr.fs.Volume
@@ -35,8 +35,8 @@ import org.oxycblt.musikr.fs.path.VolumeManager
 import org.oxycblt.musikr.playlist.ExportConfig
 import org.oxycblt.musikr.playlist.ImportedPlaylist
 import org.oxycblt.musikr.playlist.PossiblePaths
+import org.oxycblt.musikr.resolveNames
 import org.oxycblt.musikr.tag.util.correctWhitespace
-import org.oxycblt.auxio.util.unlikelyToBeNull
 import timber.log.Timber as L
 
 /**
@@ -154,8 +154,7 @@ constructor(
             else ->
                 listOf(
                     InterpretedPath(Components.parseUnix(path), false),
-                    InterpretedPath(Components.parseWindows(path), true)
+                    InterpretedPath(Components.parseWindows(path), true))
-                )
         }
 
     private fun expandInterpretation(

app/src/main/java/org/oxycblt/musikr/tag/interpret/PreMusic.kt

@@ -20,17 +20,17 @@ package org.oxycblt.musikr.tag.interpret
 
 import android.net.Uri
 import java.util.UUID
-import org.oxycblt.musikr.Music
 import org.oxycblt.auxio.music.MusicType
+import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment
+import org.oxycblt.auxio.util.update
 import org.oxycblt.musikr.MimeType
+import org.oxycblt.musikr.Music
 import org.oxycblt.musikr.fs.Path
 import org.oxycblt.musikr.playlist.PlaylistHandle
 import org.oxycblt.musikr.tag.Date
 import org.oxycblt.musikr.tag.Disc
 import org.oxycblt.musikr.tag.Name
 import org.oxycblt.musikr.tag.ReleaseType
-import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment
-import org.oxycblt.auxio.util.update
 
 data class PreSong(
     val musicBrainzId: UUID?,

app/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt

@@ -20,16 +20,16 @@ package org.oxycblt.musikr.tag.interpret
 
 import javax.inject.Inject
 import org.oxycblt.auxio.R
-import org.oxycblt.musikr.fs.DeviceFile
+import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment
+import org.oxycblt.auxio.util.toUuidOrNull
 import org.oxycblt.musikr.MimeType
+import org.oxycblt.musikr.fs.DeviceFile
 import org.oxycblt.musikr.tag.Disc
 import org.oxycblt.musikr.tag.Interpretation
 import org.oxycblt.musikr.tag.Name
 import org.oxycblt.musikr.tag.ReleaseType
 import org.oxycblt.musikr.tag.parse.ParsedTags
 import org.oxycblt.musikr.tag.util.parseId3GenreNames
-import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment
-import org.oxycblt.auxio.util.toUuidOrNull
 
 interface TagInterpreter {
     fun interpret(file: DeviceFile, parsedTags: ParsedTags, interpretation: Interpretation): PreSong

app/src/main/java/org/oxycblt/musikr/tag/parse/ExoPlayerTagFields.kt

@@ -19,10 +19,10 @@
 package org.oxycblt.musikr.tag.parse
 
 import androidx.core.text.isDigitsOnly
+import org.oxycblt.auxio.util.nonZeroOrNull
 import org.oxycblt.musikr.tag.Date
 import org.oxycblt.musikr.tag.util.parseId3v2PositionField
 import org.oxycblt.musikr.tag.util.parseVorbisPositionField
-import org.oxycblt.auxio.util.nonZeroOrNull
 
 // Song
 fun ExoPlayerTags.musicBrainzId() =