musikr: clarify album added timestamp api

Same reasons, should be milliseconds
OxygenCobalt · Jan 10, 2025 · e6b326a · e6b326a
1 parent ae6a043
commit e6b326a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt
@@ -43,7 +43,6 @@ import org.oxycblt.auxio.music.MusicViewModel
 import org.oxycblt.auxio.music.resolve
 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
@@ -128,7 +127,7 @@ class AlbumListFragment :
 
             // Last added -> Format as date
             is Sort.Mode.ByDateAdded -> {
-                val dateAddedMillis = album.dateAdded.secsToMs()
+                val dateAddedMillis = album.addedMs
                 formatterSb.setLength(0)
                 DateUtils.formatDateRange(
                         context,

diff --git a/app/src/main/java/org/oxycblt/auxio/list/sort/Sort.kt b/app/src/main/java/org/oxycblt/auxio/list/sort/Sort.kt
@@ -368,8 +368,8 @@ data class Sort(val mode: Mode, val direction: Direction) {
             override fun sortAlbums(albums: MutableList<Album>, direction: Direction) {
                 albums.sortBy { it.name }
                 when (direction) {
-                    Direction.ASCENDING -> albums.sortBy { it.dateAdded }
-                    Direction.DESCENDING -> albums.sortByDescending { it.dateAdded }
+                    Direction.ASCENDING -> albums.sortBy { it.addedMs }
+                    Direction.DESCENDING -> albums.sortByDescending { it.addedMs }
                 }
             }
         }

diff --git a/musikr/src/main/java/org/oxycblt/musikr/Music.kt b/musikr/src/main/java/org/oxycblt/musikr/Music.kt
@@ -317,8 +317,8 @@ interface Album : MusicParent {
     val covers: CoverCollection
     /** The duration of all songs in the album, in milliseconds. */
     val durationMs: Long
-    /** The earliest date a song in this album was added, as a unix epoch timestamp. */
-    val dateAdded: Long
+    /** The earliest date a song in this album was added, in milliseconds since the unix epoch. */
+    val addedMs: Long
     /**
      * The parent [Artist]s of this [Album]. Is often one, but there can be multiple if more than
      * one [Artist] name was specified in the metadata of the [Song]'s. Unlike [Song], album artists

diff --git a/musikr/src/main/java/org/oxycblt/musikr/model/AlbumImpl.kt b/musikr/src/main/java/org/oxycblt/musikr/model/AlbumImpl.kt
@@ -55,7 +55,7 @@ class AlbumImpl internal constructor(private val core: AlbumCore) : Album {
     override val name = preAlbum.name
     override val releaseType = preAlbum.releaseType
     override val durationMs = core.songs.sumOf { it.durationMs }
-    override val dateAdded = core.songs.minOf { it.addedMs }
+    override val addedMs = core.songs.minOf { it.addedMs }
     override val covers = CoverCollection.from(core.songs.mapNotNull { it.cover })
     override val dates: Date.Range? =
         core.songs.mapNotNull { it.date }.ifEmpty { null }?.run { Date.Range(min(), max()) }