nik/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-05-03 06:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle folder IDs in getMusicDirectory per Subsonic spec

Browse Source 
Signed-off-by: Patrik Wallström <pawal@amplitut.de>
This commit is contained in:
Patrik Wallström 2026-03-15 01:35:12 +01:00
parent c2b2e42170
commit 03f43c1f60
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/subsonic/browsing.go
View File

@ -143,6 +143,8 @@ func (api *Router) GetMusicDirectory(r *http.Request) (*responses.Subsonic, erro
var dir *responses.Directory
switch v := entity.(type) {
case *model.Folder:
dir, err = api.buildFolderDirectory(ctx, v)
case *model.Artist:
dir, err = api.buildArtistDirectory(ctx, v)
case *model.Album:

46
server/subsonic/browsing_test.go
View File

@ -143,6 +143,52 @@ var _ = Describe("Browsing", func() {
})
})
Describe("GetMusicDirectory with folder ID", func() {
It("returns directory for a valid folder ID", func() {
ctx = contextWithUser(ctx, "user-id", 1)
folder := model.Folder{ID: "folder-1", ParentID: "root-1", Name: "Rock"}
ds.Folder(ctx).(*tests.MockFolderRepo).SetData([]model.Folder{folder})
r := httptest.NewRequest("GET", "/rest/getMusicDirectory?id=folder-1", nil)
r = r.WithContext(ctx)
response, err := api.GetMusicDirectory(r)
Expect(err).ToNot(HaveOccurred())
Expect(response.Directory).ToNot(BeNil())
Expect(response.Directory.Id).To(Equal("folder-1"))
Expect(response.Directory.Name).To(Equal("Rock"))
Expect(response.Directory.Parent).To(Equal("root-1"))
})
It("returns error for unknown ID", func() {
ctx = contextWithUser(ctx, "user-id", 1)
r := httptest.NewRequest("GET", "/rest/getMusicDirectory?id=nonexistent", nil)
r = r.WithContext(ctx)
response, err := api.GetMusicDirectory(r)
Expect(err).To(HaveOccurred())
Expect(response).To(BeNil())
})
It("includes child folders as IsDir=true entries in the directory", func() {
ctx = contextWithUser(ctx, "user-id", 1)
folder := model.Folder{ID: "folder-1", ParentID: "", Name: "Music"}
child := model.Folder{ID: "folder-2", ParentID: "folder-1", Name: "Jazz"}
ds.Folder(ctx).(*tests.MockFolderRepo).SetData([]model.Folder{folder, child})
r := httptest.NewRequest("GET", "/rest/getMusicDirectory?id=folder-1", nil)
r = r.WithContext(ctx)
response, err := api.GetMusicDirectory(r)
Expect(err).ToNot(HaveOccurred())
// The mock returns all folders; verify child-2 is present and IsDir
Expect(response.Directory.Child).To(ContainElement(
And(HaveField("Id", "folder-2"), HaveField("IsDir", true)),
))
})
})
Describe("GetIndexes", func() {
It("should validate user access to the specified musicFolderId", func() {
// Create mock user with access to library 1 only