mirrors
/
navidrome
mirror of https://github.com/navidrome/navidrome.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make Subsonic search query default to `""` if not present. 

See https://github.com/orgs/music-assistant/discussions/414#discussioncomment-8265985
This commit is contained in:
Deluan 2024-01-27 20:00:02 -05:00
parent 5f9b6b632d
commit 5125558f52
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/subsonic/searching.go
View File

@ -27,14 +27,10 @@ type searchParams struct {
songOffset int
}
func (api *Router) getParams(r *http.Request) (*searchParams, error) {
func (api *Router) getSearchParams(r *http.Request) (*searchParams, error) {
p := req.Params(r)
var err error
sp := &searchParams{}
sp.query, err = p.String("query")
if err != nil {
return nil, err
}
sp.query = p.StringOr("query", `""`)
sp.artistCount = p.IntOr("artistCount", 20)
sp.artistOffset = p.IntOr("artistOffset", 0)
sp.albumCount = p.IntOr("albumCount", 20)
@ -91,7 +87,7 @@ func (api *Router) searchAll(ctx context.Context, sp *searchParams) (mediaFiles
func (api *Router) Search2(r *http.Request) (*responses.Subsonic, error) {
ctx := r.Context()
sp, err := api.getParams(r)
sp, err := api.getSearchParams(r)
if err != nil {
return nil, err
}
@ -122,7 +118,7 @@ func (api *Router) Search2(r *http.Request) (*responses.Subsonic, error) {
func (api *Router) Search3(r *http.Request) (*responses.Subsonic, error) {
ctx := r.Context()
sp, err := api.getParams(r)
sp, err := api.getSearchParams(r)
if err != nil {
return nil, err
}