arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
server/subsonic/searching.go
+4 -8
View File
@@ -27,14 +27,10 @@ type searchParams struct {
songOffset int songOffset int
} }
func (api *Router) getParams(r *http.Request) (*searchParams, error) { func (api *Router) getSearchParams(r *http.Request) (*searchParams, error) {
p := req.Params(r) p := req.Params(r)
var err error
sp := &searchParams{} sp := &searchParams{}
sp.query, err = p.String("query") sp.query = p.StringOr("query", `""`)
if err != nil {
return nil, err
}
sp.artistCount = p.IntOr("artistCount", 20) sp.artistCount = p.IntOr("artistCount", 20)
sp.artistOffset = p.IntOr("artistOffset", 0) sp.artistOffset = p.IntOr("artistOffset", 0)
sp.albumCount = p.IntOr("albumCount", 20) 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) { func (api *Router) Search2(r *http.Request) (*responses.Subsonic, error) {
ctx := r.Context() ctx := r.Context()
sp, err := api.getParams(r) sp, err := api.getSearchParams(r)
if err != nil { if err != nil {
return nil, err 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) { func (api *Router) Search3(r *http.Request) (*responses.Subsonic, error) {
ctx := r.Context() ctx := r.Context()
sp, err := api.getParams(r) sp, err := api.getSearchParams(r)
if err != nil { if err != nil {
return nil, err return nil, err
} }