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

Add Subsonic.FolderBrowsing config flag to gate getIndexes behavior

Browse Source 
Signed-off-by: Patrik Wallström <pawal@amplitut.de>
This commit is contained in:
Patrik Wallström 2026-03-15 02:02:40 +01:00
parent 235632f3e5
commit 501cfce841
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/subsonic/browsing.go
View File

@ -107,7 +107,12 @@ func (api *Router) GetIndexes(r *http.Request) (*responses.Subsonic, error) {
}
ifModifiedSince := p.TimeOr("ifModifiedSince", time.Time{})
res, err := api.getFolderIndex(r.Context(), musicFolderIds, ifModifiedSince)
var res *responses.Indexes
if conf.Server.Subsonic.FolderBrowsing {
res, err = api.getFolderIndex(r.Context(), musicFolderIds, ifModifiedSince)
} else {
res, err = api.getArtistIndex(r, musicFolderIds, ifModifiedSince)
}
if err != nil {
return nil, err
}

21
server/subsonic/browsing_test.go
View File

@ -5,6 +5,7 @@ import (
"fmt"
"net/http/httptest"
"github.com/navidrome/navidrome/conf"
"github.com/navidrome/navidrome/core/auth"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/model/request"
@ -262,6 +263,26 @@ var _ = Describe("Browsing", func() {
Expect(response.Indexes.Index[0].Name).To(Equal("#"))
Expect(response.Indexes.Index[0].Artists[0].Id).To(Equal("f-90s"))
})
It("falls back to artist-based index when FolderBrowsing is disabled", func() {
conf.Server.Subsonic.FolderBrowsing = false
DeferCleanup(func() { conf.Server.Subsonic.FolderBrowsing = true })
ctx = contextWithUser(ctx, "user-id", 1)
ds.Artist(ctx).(*tests.MockArtistRepo).SetData(model.Artists{
{ID: "a-1", Name: "Kraftwerk"},
})
r := httptest.NewRequest("GET", "/rest/getIndexes", nil)
r = r.WithContext(ctx)
response, err := api.GetIndexes(r)
Expect(err).ToNot(HaveOccurred())
Expect(response.Indexes).ToNot(BeNil())
// Artist-based index returns artist entries, not folder entries
Expect(response.Indexes.Index).ToNot(BeEmpty())
Expect(response.Indexes.Index[0].Artists[0].Id).To(Equal("a-1"))
})
})
Describe("GetArtists", func() {