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

queue: retain reset identity across duplicate edits

Browse Source
This commit is contained in:
austinried
2026-11-14 12:03:42 +00:00
parent b9085af44c
commit 0448842f60
2 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/test/kotlin/com/subtracks/data/repo/QueueRepositoryTest.kt
+43
View File
@@ -508,6 +508,29 @@ class QueueRepositoryTest {
assertEquals(2L, repository.cursor())
}
@Test
fun anUnrelatedOriginResetSkipsMovedSongsFromOtherPlaylistOccurrences() =
runTest {
seedLibrary()
db.libraryDao().upsertSongs(listOf(song("s0", "al1", track = 0, album = "First Album")))
setPlaylist("p2", "s4")
setPlaylist("p1", "s1", "s2", "s1")
val snapshot = repository.snapshotAfter(listOf(repository.playlistEntry(1, "p2"), repository.playlistEntry(1, "p1")))
repository.move(snapshot, from = 3, to = 1)
repository.setCursor(2)
repository.setPosition(42_000L)
val point = repository.captureResetPoint()
setPlaylist("p2", "s0", "s4")
repository.resetChangedOrigins(setOf(QueueOrigin(QueueKind.Playlist, 1, "p2")), point)
val updated = repository.snapshot()
assertEquals(listOf("s0", "s4", "s1", "s1", "s2"), resolveAll(updated))
assertEquals(3L, repository.remapPosition(updated, point.current!!))
assertEquals(3L, repository.cursor())
assertEquals(42_000L, repository.cursorPositionMs())
}
@Test
fun aRemovedDuplicateOccurrenceDoesNotLeaveItsOffsetOnTheSurvivor() =
runTest {
@@ -613,6 +636,26 @@ class QueueRepositoryTest {
assertEquals(3L, repository.snapshot().upNextAnchor)
}
@Test
fun aResetKeepsTheCapturedDuplicateGroupAfterReordering() =
runTest {
seedLibrary()
setPlaylist("p1", "s1", "s2")
repository.snapshotAfter(listOf(repository.playlistEntry(1, "p1"), repository.playlistEntry(1, "p1")))
repository.setCursor(3)
repository.setPosition(42_000L)
val point = repository.captureResetPoint()
repository.move(repository.snapshot(), from = 2, to = 0)
repository.resetChangedOrigins(setOf(QueueOrigin(QueueKind.Playlist, 1, "p1")), point)
val updated = repository.snapshot()
assertEquals(listOf("s1", "s2", "s1", "s2"), resolveAll(updated))
assertEquals(1L, repository.remapPosition(updated, point.current!!))
assertEquals(1L, repository.cursor())
assertEquals(42_000L, repository.cursorPositionMs())
}
@Test
fun aChangedOriginResetRestoresFullyFragmentedDuplicateEntries() =
runTest {