From e08d993e35ead9e66acc39de74544396b070a8ce Mon Sep 17 00:00:00 2001 From: TapTap Date: Sat, 14 Nov 2026 11:36:01 +0000 Subject: [PATCH] fix: browse artist directories in getMusicDirectory 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. --- .../subsonic/routes/BrowsingRoutes.kt | 51 +++++++++++++++---- .../subsonic/BrowsingRoutesTest.kt | 26 ++++++++++ 2 files changed, 66 insertions(+), 11 deletions(-) diff --git a/src/main/kotlin/win/taptap/musicmanager/subsonic/routes/BrowsingRoutes.kt b/src/main/kotlin/win/taptap/musicmanager/subsonic/routes/BrowsingRoutes.kt index a023a51..338284e 100644 --- a/src/main/kotlin/win/taptap/musicmanager/subsonic/routes/BrowsingRoutes.kt +++ b/src/main/kotlin/win/taptap/musicmanager/subsonic/routes/BrowsingRoutes.kt @@ -8,6 +8,7 @@ import kotlinx.serialization.json.buildJsonObject import kotlinx.serialization.json.put import win.taptap.musicmanager.config.LibraryConfig import win.taptap.musicmanager.config.UsersConfig +import win.taptap.musicmanager.db.AlbumRecord import win.taptap.musicmanager.db.LibraryRepository import win.taptap.musicmanager.subsonic.models.IGNORED_ARTICLES 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"]) + 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-")) { val album = LibraryRepository.album(id, folders, user.name) if (album == null) { @@ -176,17 +199,7 @@ fun Route.browsingRoutes(users: UsersConfig, library: LibraryConfig) { put("id", folderId) put("title", folder.name) put("child", buildJsonArray { - albums.forEach { album -> - 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) } - }) - } + albums.forEach { add(albumDirectoryJson(it, folderId.toString())) } }) }) }, @@ -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 { val raw = this[name] ?: return default val parsed = raw.toIntOrNull() ?: return default diff --git a/src/test/kotlin/win/taptap/musicmanager/subsonic/BrowsingRoutesTest.kt b/src/test/kotlin/win/taptap/musicmanager/subsonic/BrowsingRoutesTest.kt index e496059..d18b26f 100644 --- a/src/test/kotlin/win/taptap/musicmanager/subsonic/BrowsingRoutesTest.kt +++ b/src/test/kotlin/win/taptap/musicmanager/subsonic/BrowsingRoutesTest.kt @@ -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 fun `lyrics endpoint returns an empty structure when the song has no lyrics`() { seededContext().use { seed ->