diff options
| author | tikuf <admin@nyalindee.com> | 2014-04-07 12:53:15 +1000 |
|---|---|---|
| committer | tikuf <admin@nyalindee.com> | 2014-04-07 12:53:15 +1000 |
| commit | 89b467ad193a81a5e5cd4b3ad472fc3f2189913c (patch) | |
| tree | 4d9e418bb844af965610bdd705f94fbfacba82bc | |
| parent | 8ae71b75fb024815e165eba9b3d00ca8307caab3 (diff) | |
| parent | df84a2bdc38f6b567c7e1bcb34d33bd54506460e (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/ArtistsService.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/MediaBrowser.Api/UserLibrary/ArtistsService.cs b/MediaBrowser.Api/UserLibrary/ArtistsService.cs index 5ca0d75ac..8b1c5ba88 100644 --- a/MediaBrowser.Api/UserLibrary/ArtistsService.cs +++ b/MediaBrowser.Api/UserLibrary/ArtistsService.cs @@ -111,6 +111,7 @@ namespace MediaBrowser.Api.UserLibrary { return items .OfType<IHasArtist>() + .Where(i => !(i is MusicAlbum)) .SelectMany(i => i.AllArtists) .Distinct(StringComparer.OrdinalIgnoreCase) .Select(name => diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs index bc260c696..cce241542 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs @@ -31,6 +31,23 @@ namespace MediaBrowser.Controller.Entities.Audio } } + [IgnoreDataMember] + public List<string> AllArtists + { + get + { + var list = new List<string>(); + + if (!string.IsNullOrEmpty(AlbumArtist)) + { + list.Add(AlbumArtist); + } + list.AddRange(Artists); + + return list; + } + } + /// <summary> /// Gets or sets the tags. /// </summary> |