From 0ee070b38ccb68db6d36560737845e7f301350e2 Mon Sep 17 00:00:00 2001 From: Deluan Date: Mon, 14 Mar 2016 11:42:33 -0400 Subject: [PATCH] Using Entries instead of []Entry --- engine/browser.go | 6 +++--- engine/playlists.go | 4 ++-- engine/search.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/browser.go b/engine/browser.go index 3aef62025..a58a20a57 100644 --- a/engine/browser.go +++ b/engine/browser.go @@ -56,7 +56,7 @@ func (b browser) Indexes(ifModifiedSince time.Time) (*domain.ArtistIndexes, time type DirectoryInfo struct { Id string Name string - Entries []Entry + Entries Entries } func (c browser) Directory(id string) (*DirectoryInfo, error) { @@ -87,7 +87,7 @@ func (c browser) Directory(id string) (*DirectoryInfo, error) { func (c browser) buildArtistDir(a *domain.Artist, albums *domain.Albums) *DirectoryInfo { dir := &DirectoryInfo{Id: a.Id, Name: a.Name} - dir.Entries = make([]Entry, len(*albums)) + dir.Entries = make(Entries, len(*albums)) for i, al := range *albums { dir.Entries[i] = FromAlbum(&al) } @@ -97,7 +97,7 @@ func (c browser) buildArtistDir(a *domain.Artist, albums *domain.Albums) *Direct func (c browser) buildAlbumDir(al *domain.Album, tracks *domain.MediaFiles) *DirectoryInfo { dir := &DirectoryInfo{Id: al.Id, Name: al.Name} - dir.Entries = make([]Entry, len(*tracks)) + dir.Entries = make(Entries, len(*tracks)) for i, mf := range *tracks { dir.Entries[i] = FromMediaFile(&mf) } diff --git a/engine/playlists.go b/engine/playlists.go index 2807eacc6..de89e3fc9 100644 --- a/engine/playlists.go +++ b/engine/playlists.go @@ -25,7 +25,7 @@ func (p playlists) GetAll() (*domain.Playlists, error) { type PlaylistInfo struct { Id string Name string - Entries []Entry + Entries Entries } func (p playlists) Get(id string) (*PlaylistInfo, error) { @@ -39,7 +39,7 @@ func (p playlists) Get(id string) (*PlaylistInfo, error) { } pinfo := &PlaylistInfo{Id: pl.Id, Name: pl.Name} - pinfo.Entries = make([]Entry, len(pl.Tracks)) + pinfo.Entries = make(Entries, len(pl.Tracks)) // TODO Optimize: Get all tracks at once for i, mfId := range pl.Tracks { diff --git a/engine/search.go b/engine/search.go index 14752ab66..efaf53bbb 100644 --- a/engine/search.go +++ b/engine/search.go @@ -7,7 +7,7 @@ import ( "github.com/deluan/gosonic/domain" ) -type Results []Entry +type Results Entries type Search interface { ClearAll() error