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

harden sync for large libraries: bounded prune, concurrent fetches, higher page cap

Browse Source
This commit is contained in:
austinried
2026-10-04 00:29:59 +00:00
parent af38f34ecd
commit 34f15176d7
18 changed files with 324 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/test/kotlin/com/subtracks/data/db/LibraryDaoTest.kt
-2
View File
@@ -162,8 +162,6 @@ class LibraryDaoTest {
year = year,
starred = starred,
songCount = 1,
frequentRank = null,
recentRank = null,
)
private fun song(
app/src/test/kotlin/com/subtracks/data/repo/QueueRepositoryTest.kt
-2
View File
@@ -405,8 +405,6 @@ class QueueRepositoryTest {
year = null,
starred = null,
songCount = 1,
frequentRank = null,
recentRank = null,
)
private fun song(
app/src/test/kotlin/com/subtracks/data/source/subsonic/SubsonicSourceTest.kt
+124 -2
View File
@@ -16,6 +16,8 @@ import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import java.util.concurrent.CopyOnWriteArrayList
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicInteger
class SubsonicSourceTest {
@@ -91,12 +93,15 @@ class SubsonicSourceTest {
fun albumsPaginateUntilAShortPage() =
runBlocking {
val requestedOffsets = CopyOnWriteArrayList<Int>()
val requestedTypes = CopyOnWriteArrayList<String>()
server.dispatcher =
object : Dispatcher() {
override fun dispatch(request: RecordedRequest): MockResponse {
val url = request.requestUrl!!
if (url.encodedPath != "/rest/getAlbumList2.view") return MockResponse().setResponseCode(404)
if (url.queryParameter("type") != "newest") {
val type = url.queryParameter("type")!!
requestedTypes += type
if (type != "newest") {
return MockResponse().setBody(emptyAlbumList())
}
val offset = url.queryParameter("offset")!!.toInt()
@@ -110,6 +115,7 @@ class SubsonicSourceTest {
assertEquals(1003, albums.size)
assertEquals(listOf(0, 500, 1000), requestedOffsets.toList())
assertEquals(listOf("newest"), requestedTypes.distinct())
assertEquals("al-0", albums.first().id)
assertEquals("al-1002", albums.last().id)
}
@@ -200,7 +206,10 @@ class SubsonicSourceTest {
SubsonicSource(1, client(), maxPages = 2).albums().toList()
}
assertEquals(true, failure.exceptionOrNull() is SubsonicException)
val thrown = failure.exceptionOrNull()
assertEquals(true, thrown is SubsonicException)
assertTrue(thrown?.message.orEmpty(), thrown?.message.orEmpty().contains("too large"))
assertTrue(thrown?.message.orEmpty(), thrown?.message.orEmpty().contains("1000 rows"))
}
@Test
@@ -270,6 +279,119 @@ class SubsonicSourceTest {
assertEquals("al-502", albums.last().id)
}
@Test
fun playlistSongsFetchesPlaylistsConcurrently() =
runBlocking {
val inFlight = AtomicInteger()
val maxInFlight = AtomicInteger()
val secondStarted = CountDownLatch(1)
server.dispatcher =
object : Dispatcher() {
override fun dispatch(request: RecordedRequest): MockResponse {
val url = request.requestUrl!!
if (url.encodedPath != "/rest/getPlaylist.view") return MockResponse().setResponseCode(404)
val current = inFlight.incrementAndGet()
maxInFlight.updateAndGet { maxOf(it, current) }
if (current >= 2) secondStarted.countDown()
secondStarted.await(2, TimeUnit.SECONDS)
inFlight.decrementAndGet()
val playlistId = url.queryParameter("id")!!
return MockResponse().setBody(
"<subsonic-response status=\"ok\"><playlist id=\"$playlistId\">" +
(1..3).joinToString("") { "<entry id=\"$playlistId-s$it\" title=\"Title $it\"/>" } +
"</playlist></subsonic-response>",
)
}
}
val entries = SubsonicSource(1, client()).playlistSongs(listOf("p1", "p2", "p3", "p4")).toList().flatten()
assertEquals(12, entries.size)
assertEquals(4, entries.map { it.playlistId }.distinct().size)
entries.groupBy { it.playlistId }.forEach { (playlistId, batch) ->
assertEquals(listOf(0L, 1L, 2L), batch.sortedBy { it.position }.map { it.position })
assertEquals((1..3).map { "$playlistId-s$it" }, batch.sortedBy { it.position }.map { it.songId })
}
assertTrue(maxInFlight.get() >= 2)
}
@Test
fun playlistSongsPropagatesFailuresFromAnyPlaylist() =
runBlocking {
server.dispatcher =
object : Dispatcher() {
override fun dispatch(request: RecordedRequest): MockResponse {
val url = request.requestUrl!!
if (url.encodedPath != "/rest/getPlaylist.view") return MockResponse().setResponseCode(404)
return if (url.queryParameter("id") == "p2") {
MockResponse().setBody(failed(70, "Playlist not found"))
} else {
MockResponse().setBody(
"<subsonic-response status=\"ok\"><playlist id=\"p1\">" +
"<entry id=\"s1\" title=\"One\"/>" +
"</playlist></subsonic-response>",
)
}
}
}
val failure = runCatching { SubsonicSource(1, client()).playlistSongs(listOf("p1", "p2", "p3")).toList() }
assertEquals(true, failure.exceptionOrNull() is SubsonicException)
}
@Test
fun albumSongsFetchesAlbumsConcurrentlyWhenSearchIsUnsupported() =
runBlocking {
val inFlight = AtomicInteger()
val maxInFlight = AtomicInteger()
val secondStarted = CountDownLatch(1)
server.dispatcher =
object : Dispatcher() {
override fun dispatch(request: RecordedRequest): MockResponse {
val url = request.requestUrl!!
return when {
url.encodedPath == "/rest/search3.view" -> {
MockResponse().setBody(failed(10, "Required parameter is missing"))
}
url.encodedPath == "/rest/getAlbumList2.view" -> {
MockResponse().setBody(
"<subsonic-response status=\"ok\"><albumList2>" +
(0 until 4).joinToString("") {
"<album id=\"al$it\" name=\"Album $it\" artist=\"Artist\" artistId=\"ar1\" songCount=\"1\"/>"
} +
"</albumList2></subsonic-response>",
)
}
url.encodedPath == "/rest/getAlbum.view" -> {
val current = inFlight.incrementAndGet()
maxInFlight.updateAndGet { maxOf(it, current) }
if (current >= 2) secondStarted.countDown()
secondStarted.await(2, TimeUnit.SECONDS)
inFlight.decrementAndGet()
val albumId = url.queryParameter("id")!!
MockResponse().setBody(
"<subsonic-response status=\"ok\"><album id=\"$albumId\">" +
"<song id=\"$albumId-s1\" title=\"One\"/>" +
"</album></subsonic-response>",
)
}
else -> {
MockResponse().setResponseCode(404)
}
}
}
}
val songs = SubsonicSource(1, client()).songs().toList().flatten()
assertEquals(4, songs.size)
assertTrue(maxInFlight.get() >= 2)
}
@Test
fun playlistEntriesWithoutIdsAreSkipped() =
runBlocking {
app/src/test/kotlin/com/subtracks/data/sync/SyncServiceTest.kt
+17 -2
View File
@@ -525,6 +525,23 @@ class SyncServiceTest {
assertEquals(0, db.libraryDao().artistIds(1).size)
}
@Test
fun partialPruneAcrossManyPagesKeepsTheSurvivors() =
runTest {
insertSource()
val source = FakeMusicSource(artists = (1..1100).map { artist("a$it") })
SyncService(db, source).sync()
assertEquals(1100, db.libraryDao().artistIds(1).size)
val survivors = (1..1100).filter { it % 2 == 0 }.map { "a$it" }
source.artists = survivors.map { artist(it) }
SyncService(db, source).sync()
assertEquals(survivors.sorted(), db.libraryDao().artistIds(1).sorted())
}
@Test
fun anIdenticalSyncDoesNotRewriteRows() =
runTest {
@@ -593,8 +610,6 @@ class SyncServiceTest {
year = null,
starred = null,
songCount = 1,
frequentRank = null,
recentRank = null,
)
private fun song(id: String) =
app/src/test/kotlin/com/subtracks/ui/AlbumDiscsTest.kt
-2
View File
@@ -150,7 +150,5 @@ class AlbumDiscsTest {
year = null,
starred = null,
songCount = 3,
frequentRank = null,
recentRank = null,
)
}
app/src/test/kotlin/com/subtracks/ui/AppScreenshotTest.kt
-2
View File
@@ -603,8 +603,6 @@ private object Fixtures {
year = year,
starred = null,
songCount = songCount,
frequentRank = null,
recentRank = null,
)
fun song(
app/src/test/kotlin/com/subtracks/ui/LibraryOptionsScreenshotTest.kt
-2
View File
@@ -82,8 +82,6 @@ class LibraryOptionsScreenshotTest {
year = null,
starred = null,
songCount = 1,
frequentRank = null,
recentRank = null,
)
}
}
app/src/test/kotlin/com/subtracks/ui/LibraryOptionsTest.kt
-2
View File
@@ -113,8 +113,6 @@ class LibraryOptionsTest {
year = null,
starred = null,
songCount = 1,
frequentRank = null,
recentRank = null,
)
}
}
app/src/test/kotlin/com/subtracks/ui/LibraryScreenTest.kt
-2
View File
@@ -279,8 +279,6 @@ class LibraryScreenTest {
year = null,
starred = null,
songCount = 1,
frequentRank = null,
recentRank = null,
)
}
app/src/test/kotlin/com/subtracks/ui/LibrarySearchScreenshotTest.kt
-2
View File
@@ -86,8 +86,6 @@ class LibrarySearchScreenshotTest {
year = null,
starred = null,
songCount = 1,
frequentRank = null,
recentRank = null,
)
}
}