diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-04 09:19:03 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-04 09:19:03 -0400 |
| commit | 981973a028f51410b5fcc114d959bcad326aac52 (patch) | |
| tree | 163d0f0fc5a4ddc990178157a3921cae8056187e | |
| parent | 8204d8938a723dee8205593ae0b2f77614078a4a (diff) | |
use mbz id for last fm searches when we have it
| -rw-r--r-- | MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs | 33 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 6 |
2 files changed, 4 insertions, 35 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs index b364e0ac4..3cb2b51fe 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs @@ -1,6 +1,4 @@ -using MediaBrowser.Model.Entities; -using System.Collections.Generic; -using System.Linq; +using System.Linq; using System.Runtime.Serialization; namespace MediaBrowser.Controller.Entities.Audio @@ -54,35 +52,6 @@ namespace MediaBrowser.Controller.Entities.Audio } /// <summary> - /// Gets or sets the images. - /// </summary> - /// <value>The images.</value> - public override Dictionary<ImageType, string> Images - { - get - { - var images = base.Images; - string primaryImagePath; - - if (!images.TryGetValue(ImageType.Primary, out primaryImagePath)) - { - var image = Children.Select(c => c.PrimaryImagePath).FirstOrDefault(c => !string.IsNullOrEmpty(c)); - - if (!string.IsNullOrEmpty(image)) - { - images[ImageType.Primary] = image; - } - } - - return images; - } - set - { - base.Images = value; - } - } - - /// <summary> /// Determines whether the specified artist has artist. /// </summary> /// <param name="artist">The artist.</param> diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index e756d2211..a15c30e42 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -27,7 +27,7 @@ namespace MediaBrowser.Controller.Entities /// MusicAlbums in the library that are the soundtrack for this item /// </summary> public List<Guid> SoundtrackIds { get; set; } - + protected BaseItem() { Genres = new List<string>(); @@ -63,7 +63,7 @@ namespace MediaBrowser.Controller.Entities public const string XbmcTrailerFileSuffix = "-trailer"; public bool IsInMixedFolder { get; set; } - + private string _name; /// <summary> /// Gets or sets the name. @@ -151,7 +151,7 @@ namespace MediaBrowser.Controller.Entities /// Gets or sets the images. /// </summary> /// <value>The images.</value> - public virtual Dictionary<ImageType, string> Images { get; set; } + public Dictionary<ImageType, string> Images { get; set; } /// <summary> /// Gets or sets the date created. |
