mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-06 22:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Playlists now have all metadata. Also removed some duplicated code

Browse source
This commit is contained in:
Deluan 2016-03-21 11:57:04 -04:00
parent 516bd3bddf
commit 3cefc321b8
6 changed files with 23 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

13
api/album_list.go
View file

@ -45,13 +45,8 @@ func (c *AlbumListController) GetAlbumList() {
c.SendError(responses.ERROR_GENERIC, "Internal Error")
}
albumList := make([]responses.Child, len(albums))
for i, al := range albums {
albumList[i] = c.ToChild(al)
}
response := c.NewEmpty()
response.AlbumList = &responses.AlbumList{Album: albumList}
response.AlbumList = &responses.AlbumList{Album: c.ToChildren(albums)}
c.SendResponse(response)
}
@ -64,11 +59,7 @@ func (c *AlbumListController) GetStarred() {
response := c.NewEmpty()
response.Starred = &responses.Starred{}
response.Starred.Album = make([]responses.Child, len(albums))
for i, entry := range albums {
response.Starred.Album[i] = c.ToChild(entry)
}
response.Starred.Album = c.ToChildren(albums)
c.SendResponse(response)
}

8
api/base_api_controller.go
View file

@ -84,6 +84,14 @@ func (c *BaseAPIController) SendResponse(response responses.Subsonic) {
}
}
func (c *BaseAPIController) ToChildren(entries engine.Entries) []responses.Child {
children := make([]responses.Child, len(entries))
for i, entry := range entries {
children[i] = c.ToChild(entry)
}
return children
}
func (c *BaseAPIController) ToChild(entry engine.Entry) responses.Child {
n := responses.Child{}
n.Id = entry.Id

5
api/browsing.go
View file

@ -94,9 +94,6 @@ func (c *BrowsingController) buildDirectory(d *engine.DirectoryInfo) *responses.
dir.Starred = &d.Starred
}
dir.Child = make([]responses.Child, len(d.Entries))
for i, entry := range d.Entries {
dir.Child[i] = c.ToChild(entry)
}
dir.Child = c.ToChildren(d.Entries)
return dir
}

22
api/playlists.go
View file

@ -57,26 +57,6 @@ func (c *PlaylistsController) buildPlaylist(d *engine.PlaylistInfo) *responses.P
pls.Id = d.Id
pls.Name = d.Name
pls.Entry = make([]responses.Child, len(d.Entries))
for i, child := range d.Entries {
pls.Entry[i].Id = child.Id
pls.Entry[i].Title = child.Title
pls.Entry[i].IsDir = child.IsDir
pls.Entry[i].Parent = child.Parent
pls.Entry[i].Album = child.Album
pls.Entry[i].Year = child.Year
pls.Entry[i].Artist = child.Artist
pls.Entry[i].Genre = child.Genre
pls.Entry[i].CoverArt = child.CoverArt
pls.Entry[i].Track = child.Track
pls.Entry[i].Duration = child.Duration
pls.Entry[i].Size = child.Size
pls.Entry[i].Suffix = child.Suffix
pls.Entry[i].BitRate = child.BitRate
pls.Entry[i].ContentType = child.ContentType
if !child.Starred.IsZero() {
pls.Entry[i].Starred = &child.Starred
}
}
pls.Entry = c.ToChildren(d.Entries)
return pls
}

10
api/searching.go
View file

@ -44,14 +44,8 @@ func (c *SearchingController) Search2() {
for i, e := range as {
searchResult2.Artist[i] = responses.Artist{Id: e.Id, Name: e.Title}
}
searchResult2.Album = make([]responses.Child, len(als))
for i, e := range als {
searchResult2.Album[i] = c.ToChild(e)
}
searchResult2.Song = make([]responses.Child, len(mfs))
for i, e := range mfs {
searchResult2.Song[i] = c.ToChild(e)
}
searchResult2.Album = c.ToChildren(als)
searchResult2.Song = c.ToChildren(mfs)
response.SearchResult2 = searchResult2
c.SendResponse(response)
}

20
engine/search.go
View file

@ -9,8 +9,6 @@ import (
"github.com/kennygrant/sanitize"
)
type Results Entries
type Search interface {
ClearAll() error
IndexArtist(ar *domain.Artist) error
@ -21,9 +19,9 @@ type Search interface {
RemoveAlbum(ids []string) error
RemoveMediaFile(ids []string) error
SearchArtist(q string, offset int, size int) (Results, error)
SearchAlbum(q string, offset int, size int) (Results, error)
SearchSong(q string, offset int, size int) (Results, error)
SearchArtist(q string, offset int, size int) (Entries, error)
SearchAlbum(q string, offset int, size int) (Entries, error)
SearchSong(q string, offset int, size int) (Entries, error)
}
type search struct {
@ -79,7 +77,7 @@ func (s search) RemoveMediaFile(ids []string) error {
return s.idxSong.Remove(ids...)
}
func (s search) SearchArtist(q string, offset int, size int) (Results, error) {
func (s search) SearchArtist(q string, offset int, size int) (Entries, error) {
q = sanitize.Accents(strings.ToLower(strings.TrimSuffix(q, "*")))
min := offset
max := min + size - 1
@ -87,7 +85,7 @@ func (s search) SearchArtist(q string, offset int, size int) (Results, error) {
if err != nil {
return nil, nil
}
res := make(Results, 0, len(resp))
res := make(Entries, 0, len(resp))
for _, id := range resp {
a, err := s.artistRepo.Get(id)
if criticalError("Artist", id, err) {
@ -100,7 +98,7 @@ func (s search) SearchArtist(q string, offset int, size int) (Results, error) {
return res, nil
}
func (s search) SearchAlbum(q string, offset int, size int) (Results, error) {
func (s search) SearchAlbum(q string, offset int, size int) (Entries, error) {
q = sanitize.Accents(strings.ToLower(strings.TrimSuffix(q, "*")))
min := offset
max := min + size - 1
@ -108,7 +106,7 @@ func (s search) SearchAlbum(q string, offset int, size int) (Results, error) {
if err != nil {
return nil, nil
}
res := make(Results, 0, len(resp))
res := make(Entries, 0, len(resp))
for _, id := range resp {
al, err := s.albumRepo.Get(id)
if criticalError("Album", id, err) {
@ -121,7 +119,7 @@ func (s search) SearchAlbum(q string, offset int, size int) (Results, error) {
return res, nil
}
func (s search) SearchSong(q string, offset int, size int) (Results, error) {
func (s search) SearchSong(q string, offset int, size int) (Entries, error) {
q = sanitize.Accents(strings.ToLower(strings.TrimSuffix(q, "*")))
min := offset
max := min + size - 1
@ -129,7 +127,7 @@ func (s search) SearchSong(q string, offset int, size int) (Results, error) {
if err != nil {
return nil, nil
}
res := make(Results, 0, len(resp))
res := make(Entries, 0, len(resp))
for _, id := range resp {
mf, err := s.mfileRepo.Get(id)
if criticalError("Song", id, err) {