third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-16 20:12:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor getSong

Browse Source
This commit is contained in:
Deluan 2020-08-13 21:57:35 -04:00 committed by Deluan Quintão
parent f16dc5f8f8
commit eba8395146
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/subsonic/browsing.go
View File

@ -191,18 +191,20 @@ func (c *BrowsingController) GetAlbum(w http.ResponseWriter, r *http.Request) (*
func (c *BrowsingController) GetSong(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
id := utils.ParamString(r, "id")
song, err := c.browser.GetSong(r.Context(), id)
ctx := r.Context()
mf, err := c.ds.MediaFile(ctx).Get(id)
switch {
case err == model.ErrNotFound:
log.Error(r, "Requested ID not found ", "id", id)
log.Error(r, "Requested MediaFileID not found ", "id", id)
return nil, NewError(responses.ErrorDataNotFound, "Song not found")
case err != nil:
log.Error(r, err)
log.Error(r, "Error retrieving MediaFile", "id", id, err)
return nil, NewError(responses.ErrorGeneric, "Internal Error")
}
response := NewResponse()
child := ToChild(r.Context(), *song)
child := ChildFromMediaFile(ctx, *mf)
response.Song = &child
return response, nil
}

11
server/subsonic/engine/browser.go
View File

@ -9,7 +9,6 @@ import (
)
type Browser interface {
GetSong(ctx context.Context, id string) (*Entry, error)
GetGenres(ctx context.Context) (model.Genres, error)
}
@ -21,16 +20,6 @@ type browser struct {
ds model.DataStore
}
func (b *browser) GetSong(ctx context.Context, id string) (*Entry, error) {
mf, err := b.ds.MediaFile(ctx).Get(id)
if err != nil {
return nil, err
}
entry := FromMediaFile(mf)
return &entry, nil
}
func (b *browser) GetGenres(ctx context.Context) (model.Genres, error) {
genres, err := b.ds.Genre(ctx).GetAll()
for i, g := range genres {