From 5125558f5271af40b682feba9b675dddbf205e3f Mon Sep 17 00:00:00 2001 From: Deluan Date: Sat, 27 Jan 2024 20:00:02 -0500 Subject: [PATCH] Make Subsonic search query default to `""` if not present. See https://github.com/orgs/music-assistant/discussions/414#discussioncomment-8265985 --- server/subsonic/searching.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/server/subsonic/searching.go b/server/subsonic/searching.go index a2ba2d1c..256d2f2c 100644 --- a/server/subsonic/searching.go +++ b/server/subsonic/searching.go @@ -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 }