diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-10-20 16:23:40 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-10-20 16:23:40 -0400 |
| commit | 1292eccfb57d82110d197d7fa2f1f6bbf01a7e18 (patch) | |
| tree | 1b0fc79b52662dc680a791162379c5ccc8ae3ef7 /MediaBrowser.Controller/Entities | |
| parent | 3be4aa8dc729f5899658790f43a1d1c182e7a243 (diff) | |
add reel
Diffstat (limited to 'MediaBrowser.Controller/Entities')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Audio/MusicArtist.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/MusicVideo.cs | 37 |
2 files changed, 7 insertions, 34 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs index 070572b9b..2d9e052b1 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs @@ -226,7 +226,9 @@ namespace MediaBrowser.Controller.Entities.Audio public IEnumerable<BaseItem> GetTaggedItems(IEnumerable<BaseItem> inputItems) { - return inputItems.OfType<IHasArtist>().Where(i => i.HasArtist(Name)).Cast<BaseItem>(); + return inputItems.OfType<IHasArtist>() + .Where(i => i.HasArtist(Name)) + .Cast<BaseItem>(); } } } diff --git a/MediaBrowser.Controller/Entities/MusicVideo.cs b/MediaBrowser.Controller/Entities/MusicVideo.cs index d36bfd7c4..307117fdd 100644 --- a/MediaBrowser.Controller/Entities/MusicVideo.cs +++ b/MediaBrowser.Controller/Entities/MusicVideo.cs @@ -12,12 +12,6 @@ namespace MediaBrowser.Controller.Entities public class MusicVideo : Video, IHasArtist, IHasMusicGenres, IHasProductionLocations, IHasBudget, IHasLookupInfo<MusicVideoInfo> { /// <summary> - /// Gets or sets the artist. - /// </summary> - /// <value>The artist.</value> - public string Artist { get; set; } - - /// <summary> /// Gets or sets the album. /// </summary> /// <value>The album.</value> @@ -35,27 +29,12 @@ namespace MediaBrowser.Controller.Entities /// <value>The revenue.</value> public double? Revenue { get; set; } public List<string> ProductionLocations { get; set; } + public List<string> Artists { get; set; } public MusicVideo() { ProductionLocations = new List<string>(); - } - - [IgnoreDataMember] - public List<string> Artists - { - get - { - var list = new List<string>(); - - if (!string.IsNullOrEmpty(Artist)) - { - list.Add(Artist); - } - - return list; - - } + Artists = new List<string>(); } [IgnoreDataMember] @@ -63,15 +42,7 @@ namespace MediaBrowser.Controller.Entities { get { - var list = new List<string>(); - - if (!string.IsNullOrEmpty(Artist)) - { - list.Add(Artist); - } - - return list; - + return Artists; } } @@ -82,7 +53,7 @@ namespace MediaBrowser.Controller.Entities /// <returns><c>true</c> if the specified name has artist; otherwise, <c>false</c>.</returns> public bool HasArtist(string name) { - return string.Equals(Artist, name, StringComparison.OrdinalIgnoreCase); + return AllArtists.Contains(name, StringComparer.OrdinalIgnoreCase); } /// <summary> |
