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

Fix empty entry collection in Shares

Browse Source
This commit is contained in:
Deluan
2023-01-23 18:44:58 -05:00
parent c994ed70ea
commit e34f26588e
4 changed files with 76 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/subsonic/sharing.go
+10 -7
View File
@@ -13,12 +13,11 @@ import (
)
func (api *Router) GetShares(r *http.Request) (*responses.Subsonic, error) {
repo := api.share.NewRepository(r.Context())
entity, err := repo.ReadAll()
repo := api.share.NewRepository(r.Context()).(model.ShareRepository)
shares, err := repo.GetAll()
if err != nil {
return nil, err
}
shares := entity.(model.Shares)
response := newResponse()
response.Shares = &responses.Shares{}
@@ -29,8 +28,7 @@ func (api *Router) GetShares(r *http.Request) (*responses.Subsonic, error) {
}
func (api *Router) buildShare(r *http.Request, share model.Share) responses.Share {
return responses.Share{
Entry: childrenFromMediaFiles(r.Context(), share.Tracks),
resp := responses.Share{
ID: share.ID,
Url: public.ShareURL(r, share.ID),
Description: share.Description,
@@ -40,6 +38,12 @@ func (api *Router) buildShare(r *http.Request, share model.Share) responses.Shar
LastVisited: share.LastVisitedAt,
VisitCount: share.VisitCount,
}
if len(share.Albums) > 0 {
resp.Entry = childrenFromAlbums(r.Context(), share.Albums)
} else {
resp.Entry = childrenFromMediaFiles(r.Context(), share.Tracks)
}
return resp
}
func (api *Router) CreateShare(r *http.Request) (*responses.Subsonic, error) {
@@ -63,11 +67,10 @@ func (api *Router) CreateShare(r *http.Request) (*responses.Subsonic, error) {
return nil, err
}
entity, err := repo.Read(id)
share, err = repo.(model.ShareRepository).Get(id)
if err != nil {
return nil, err
}
share = entity.(*model.Share)
response := newResponse()
response.Shares = &responses.Shares{Share: []responses.Share{api.buildShare(r, *share)}}