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

ui: preserve queue windows during reconciliation

Browse Source
This commit is contained in:
austinried
2026-11-14 12:05:29 +00:00
parent eb4d537437
commit 97e165e8c2
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/subtracks/ui/playback/QueueScreen.kt
+11 -2
View File
@@ -180,12 +180,21 @@ class QueueViewModel(
rows.clear() rows.clear()
return return
} }
val start = ((rows.minOfOrNull { it.position } ?: OLDER_LOAD.toLong()) - OLDER_LOAD.toLong()).coerceAtLeast(0) val firstPosition = rows.minOfOrNull { it.position } ?: OLDER_LOAD.toLong()
val start = (firstPosition - OLDER_LOAD).coerceAtLeast(0)
val rawEnd = (rows.maxOfOrNull { it.position } ?: (start + QUEUE_CHUNK - 1)).coerceIn(start, snapshot.size - 1) val rawEnd = (rows.maxOfOrNull { it.position } ?: (start + QUEUE_CHUNK - 1)).coerceIn(start, snapshot.size - 1)
val end = rawEnd.coerceAtMost(start + MAX_SCAN_POSITIONS - 1) val end = rawEnd.coerceAtMost(start + MAX_SCAN_POSITIONS - 1)
val loaded = queueRepository.range(snapshot, start, end).filter(::visible) val loaded = queueRepository.range(snapshot, start, end).filter(::visible)
val reused = reusedIds() val reused = reusedIds()
val updated = loaded.map { rowFor(it, reused, snapshot.resetVersion) } val scanned = loaded.map { rowFor(it, reused, snapshot.resetVersion) }
val firstRow = rows.minByOrNull { it.position }
val windowStart =
if (firstRow == null) {
start
} else {
scanned.firstOrNull { it.id == firstRow.id && it.position < firstPosition }?.position ?: firstPosition
}
val updated = scanned.filter { it.position >= windowStart }
if (end >= rawEnd) { if (end >= rawEnd) {
if (updated.size == rows.size) { if (updated.size == rows.size) {
updated.forEachIndexed { index, row -> if (rows[index] != row) rows[index] = row } updated.forEachIndexed { index, row -> if (rows[index] != row) rows[index] = row }