third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-06-19 16:24:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Subsonic search to make it a bit more readable

Browse Source
This commit is contained in:
Deluan 2023-02-05 00:50:29 -05:00
parent 3ce3185118
commit dad4949a6d
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
server/subsonic/searching.go
View File

@ -45,22 +45,21 @@ func (api *Router) getParams(r *http.Request) (*searchParams, error) {
type searchFunc[T any] func(q string, offset int, size int) (T, error) type searchFunc[T any] func(q string, offset int, size int) (T, error)
func doSearch[T any](ctx context.Context, wg *sync.WaitGroup, s searchFunc[T], q string, offset, size int) T { func doSearch[T any](ctx context.Context, wg *sync.WaitGroup, s searchFunc[T], q string, offset, size int, result *T) {
defer wg.Done() defer wg.Done()
var res T
if size == 0 { if size == 0 {
return res return
} }
done := make(chan struct{}) done := make(chan struct{})
go func() { go func() {
typ := strings.TrimPrefix(reflect.TypeOf(res).String(), "model.") typ := strings.TrimPrefix(reflect.TypeOf(*result).String(), "model.")
var err error var err error
start := time.Now() start := time.Now()
res, err = s(q, offset, size) *result, err = s(q, offset, size)
if err != nil { if err != nil {
log.Error(ctx, "Error searching "+typ, "query", q, err) log.Error(ctx, "Error searching "+typ, "query", q, err)
} else { } else {
log.Trace(ctx, "Search for "+typ+" completed", "query", q, "elapsedTime", time.Since(start)) log.Trace(ctx, "Search for "+typ+" completed", "query", q, "elapsed", time.Since(start))
} }
done <- struct{}{} done <- struct{}{}
}() }()
@ -68,22 +67,16 @@ func doSearch[T any](ctx context.Context, wg *sync.WaitGroup, s searchFunc[T], q
case <-done: case <-done:
case <-ctx.Done(): case <-ctx.Done():
} }
return res
} }
func (api *Router) searchAll(r *http.Request, sp *searchParams) (mediaFiles model.MediaFiles, albums model.Albums, artists model.Artists) { func (api *Router) searchAll(ctx context.Context, sp *searchParams) (mediaFiles model.MediaFiles, albums model.Albums, artists model.Artists) {
start := time.Now() start := time.Now()
q := sanitize.Accents(strings.ToLower(strings.TrimSuffix(sp.query, "*"))) q := sanitize.Accents(strings.ToLower(strings.TrimSuffix(sp.query, "*")))
ctx := r.Context()
wg := &sync.WaitGroup{} wg := &sync.WaitGroup{}
wg.Add(3) wg.Add(3)
go func() { go doSearch(ctx, wg, api.ds.MediaFile(ctx).Search, q, sp.songOffset, sp.songCount, &mediaFiles)
mediaFiles = doSearch(ctx, wg, api.ds.MediaFile(ctx).Search, q, sp.songOffset, sp.songCount) go doSearch(ctx, wg, api.ds.Album(ctx).Search, q, sp.albumOffset, sp.albumCount, &albums)
}() go doSearch(ctx, wg, api.ds.Artist(ctx).Search, q, sp.artistOffset, sp.artistCount, &artists)
go func() { albums = doSearch(ctx, wg, api.ds.Album(ctx).Search, q, sp.albumOffset, sp.albumCount) }()
go func() {
artists = doSearch(ctx, wg, api.ds.Artist(ctx).Search, q, sp.artistOffset, sp.artistCount)
}()
wg.Wait() wg.Wait()
if ctx.Err() == nil { if ctx.Err() == nil {
@ -96,11 +89,12 @@ func (api *Router) searchAll(r *http.Request, sp *searchParams) (mediaFiles mode
} }
func (api *Router) Search2(r *http.Request) (*responses.Subsonic, error) { func (api *Router) Search2(r *http.Request) (*responses.Subsonic, error) {
ctx := r.Context()
sp, err := api.getParams(r) sp, err := api.getParams(r)
if err != nil { if err != nil {
return nil, err return nil, err
} }
mfs, als, as := api.searchAll(r, sp) mfs, als, as := api.searchAll(ctx, sp)
response := newResponse() response := newResponse()
searchResult2 := &responses.SearchResult2{} searchResult2 := &responses.SearchResult2{}
@ -119,8 +113,8 @@ func (api *Router) Search2(r *http.Request) (*responses.Subsonic, error) {
searchResult2.Artist[i].Starred = &as[i].StarredAt searchResult2.Artist[i].Starred = &as[i].StarredAt
} }
} }
searchResult2.Album = childrenFromAlbums(r.Context(), als) searchResult2.Album = childrenFromAlbums(ctx, als)
searchResult2.Song = childrenFromMediaFiles(r.Context(), mfs) searchResult2.Song = childrenFromMediaFiles(ctx, mfs)
response.SearchResult2 = searchResult2 response.SearchResult2 = searchResult2
return response, nil return response, nil
} }
@ -131,7 +125,7 @@ func (api *Router) Search3(r *http.Request) (*responses.Subsonic, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
mfs, als, as := api.searchAll(r, sp) mfs, als, as := api.searchAll(ctx, sp)
response := newResponse() response := newResponse()
searchResult3 := &responses.SearchResult3{} searchResult3 := &responses.SearchResult3{}