Makussu/subtracks
1
0
Fork 0
mirror of https://github.com/austinried/subtracks.git synced 2026-11-11 07:29:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

downloads: base album/artist progress on completed tracks

Browse Source 
The aggregate summed bytes over only the currently active songs, so it
reset each time a track finished and the next one started. Count completed
tracks (plus the fraction of each running track) over the node's full track
count instead, so it climbs one track at a time.
This commit is contained in:
austinried
2026-10-04 00:30:07 +00:00
parent 5e074db834
commit 196733f9a7
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/subtracks/ui/downloads/DownloadsScreen.kt
+10 -7
View File
@@ -146,13 +146,14 @@ fun DownloadsScreen(
tree.artists.forEach { artist ->
val artistKey = "artist:${artist.id}:${artist.name}"
item(key = artistKey) {
val active = activeDownloads(artist.albums.flatMap { it.songs })
val songs = artist.albums.flatMap { it.songs }
val active = activeDownloads(songs)
NodeRow(
name = artist.name,
subtitle = "${artist.albums.size} albums · ${size(artist.bytes)}",
expanded = artistKey in expanded,
indent = 0,
progress = active.progress(),
progress = nodeProgress(songs),
onToggle = { expanded = expanded.toggle(artistKey) },
onDelete = {
onDelete(
@@ -176,7 +177,7 @@ fun DownloadsScreen(
subtitle = "${album.songs.size} songs · ${size(album.bytes)}",
expanded = albumKey in expanded,
indent = 1,
progress = active.progress(),
progress = nodeProgress(album.songs),
onToggle = { expanded = expanded.toggle(albumKey) },
onDelete = {
onDelete(
@@ -277,10 +278,12 @@ private fun NodeRow(
private fun activeDownloads(songs: List<DownloadedSong>): List<DownloadedSong> =
songs.filter { it.status == DownloadStatus.Queued || it.status == DownloadStatus.Running }
private fun List<DownloadedSong>.progress(): Float? {
if (isEmpty()) return null
val total = sumOf { it.total }
return if (total > 0) (sumOf { it.bytes }.toFloat() / total).coerceIn(0f, 1f) else 0f
internal fun nodeProgress(songs: List<DownloadedSong>): Float? {
val active = activeDownloads(songs)
if (active.isEmpty() || songs.isEmpty()) return null
val completed = songs.count { it.status == DownloadStatus.Completed }
val partial = active.sumOf { (it.progress ?: 0f).toDouble() }
return ((completed + partial) / songs.size).toFloat().coerceIn(0f, 1f)
}
@Composable