fix: browse artist directories in getMusicDirectory
CI / chart (push) Successful in 3s
CI / chart-push (push) Successful in 3s
CI / test (push) Successful in 1m39s
CI / image (push) Successful in 2m59s

Symfonium uses getIndexes followed by getMusicDirectory for folder
browsing. Artist entries have ar- IDs, but getMusicDirectory only handled
al- and folder IDs, so drilling into an artist returned error 70 and the
client showed an empty directory.

Return the artist's albums as child directories, and use the same album
child shape for the folder view. Add a browsing test for the artist path.
This commit is contained in:
TapTap committed 2026-11-14 11:36:01 +00:00
1 parent b86d9feb8b
commit e08d993e35
2 files changed
+66 -11

No files matched your search

@@ -8,6 +8,7 @@ import kotlinx.serialization.json.buildJsonObject
import kotlinx.serialization.json.put import kotlinx.serialization.json.put
import win.taptap.musicmanager.config.LibraryConfig import win.taptap.musicmanager.config.LibraryConfig
import win.taptap.musicmanager.config.UsersConfig import win.taptap.musicmanager.config.UsersConfig
import win.taptap.musicmanager.db.AlbumRecord
import win.taptap.musicmanager.db.LibraryRepository import win.taptap.musicmanager.db.LibraryRepository
import win.taptap.musicmanager.subsonic.models.IGNORED_ARTICLES import win.taptap.musicmanager.subsonic.models.IGNORED_ARTICLES
import win.taptap.musicmanager.subsonic.models.albumJson import win.taptap.musicmanager.subsonic.models.albumJson
@@ -127,6 +128,28 @@ fun Route.browsingRoutes(users: UsersConfig, library: LibraryConfig) {
} }
val folders = user.effectiveFolderIds(library, parameters["musicFolderId"]) val folders = user.effectiveFolderIds(library, parameters["musicFolderId"])
if (id.startsWith("ar-")) {
val artist = LibraryRepository.artist(id, folders, user.name)
if (artist == null) {
call.respondSubsonicError(70, "Artist not found")
return@subsonicEndpoint
}
val albums = LibraryRepository.albumsForArtist(id, folders, user.name)
call.respondSubsonic(
buildJsonObject {
put("directory", buildJsonObject {
put("id", artist.id)
put("title", artist.name)
put("child", buildJsonArray {
albums.forEach { add(albumDirectoryJson(it, artist.id)) }
})
})
},
)
return@subsonicEndpoint
}
if (id.startsWith("al-")) { if (id.startsWith("al-")) {
val album = LibraryRepository.album(id, folders, user.name) val album = LibraryRepository.album(id, folders, user.name)
if (album == null) { if (album == null) {
@@ -176,17 +199,7 @@ fun Route.browsingRoutes(users: UsersConfig, library: LibraryConfig) {
put("id", folderId) put("id", folderId)
put("title", folder.name) put("title", folder.name)
put("child", buildJsonArray { put("child", buildJsonArray {
albums.forEach { album -> albums.forEach { add(albumDirectoryJson(it, folderId.toString())) }
add(buildJsonObject {
put("id", album.id)
put("parent", folderId)
put("title", album.name)
put("isDir", true)
put("album", album.name)
album.artistName?.let { put("artist", it) }
album.coverArt?.let { put("coverArt", it) }
})
}
}) })
}) })
}, },
@@ -407,6 +420,22 @@ fun Route.browsingRoutes(users: UsersConfig, library: LibraryConfig) {
} }
} }
private fun albumDirectoryJson(album: AlbumRecord, parentId: String) = buildJsonObject {
put("id", album.id)
put("parent", parentId)
put("title", album.name)
put("isDir", true)
put("album", album.name)
album.artistName?.let { put("artist", it) }
album.artistId?.let { put("artistId", it) }
album.coverArt?.let { put("coverArt", it) }
put("songCount", album.songCount)
put("duration", album.duration)
put("created", album.created)
album.year?.let { put("year", it) }
album.genres.firstOrNull()?.let { put("genre", it) }
}
private fun Parameters.intParam(name: String, default: Int, minimum: Int = 0): Int { private fun Parameters.intParam(name: String, default: Int, minimum: Int = 0): Int {
val raw = this[name] ?: return default val raw = this[name] ?: return default
val parsed = raw.toIntOrNull() ?: return default val parsed = raw.toIntOrNull() ?: return default
@@ -394,6 +394,32 @@ class BrowsingRoutesTest {
} }
} }
@Test
fun `music directory exposes artist albums for folder browsing`() {
seededContext().use { seed ->
testApplication {
setupApp(seed)
val auth = credentials("alice", "alice-pw")
val artist = parseBody(
client.get("/rest/getMusicDirectory?$auth&id=${seed.aliceArtistId}").bodyAsText(),
)["directory"]!!.jsonObject
assertEquals(seed.aliceArtistId, artist["id"]!!.jsonPrimitive.content)
val albums = artist["child"]!!.jsonArray
assertEquals(1, albums.size)
assertEquals(seed.aliceAlbumId, albums[0].jsonObject["id"]!!.jsonPrimitive.content)
assertEquals(seed.aliceArtistId, albums[0].jsonObject["parent"]!!.jsonPrimitive.content)
assertEquals("true", albums[0].jsonObject["isDir"]!!.jsonPrimitive.content)
val album = parseBody(
client.get("/rest/getMusicDirectory?$auth&id=${seed.aliceAlbumId}").bodyAsText(),
)["directory"]!!.jsonObject
assertEquals(seed.aliceSongId, album["child"]!!.jsonArray[0].jsonObject["id"]!!.jsonPrimitive.content)
}
}
}
@Test @Test
fun `lyrics endpoint returns an empty structure when the song has no lyrics`() { fun `lyrics endpoint returns an empty structure when the song has no lyrics`() {
seededContext().use { seed -> seededContext().use { seed ->