From 981973a028f51410b5fcc114d959bcad326aac52 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 4 Sep 2013 09:19:03 -0400 Subject: [PATCH] use mbz id for last fm searches when we have it --- .../Entities/Audio/MusicAlbum.cs | 33 +------------------ 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 b364e0ac4a..3cb2b51fe1 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 @@ -53,35 +51,6 @@ namespace MediaBrowser.Controller.Entities.Audio get { return Parent as MusicArtist ?? UnknwonArtist; } } - /// - /// Gets or sets the images. - /// - /// The images. - public override Dictionary 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; - } - } - /// /// Determines whether the specified artist has artist. /// diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index e756d22113..a15c30e425 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 /// public List SoundtrackIds { get; set; } - + protected BaseItem() { Genres = new List(); @@ -63,7 +63,7 @@ namespace MediaBrowser.Controller.Entities public const string XbmcTrailerFileSuffix = "-trailer"; public bool IsInMixedFolder { get; set; } - + private string _name; /// /// Gets or sets the name. @@ -151,7 +151,7 @@ namespace MediaBrowser.Controller.Entities /// Gets or sets the images. /// /// The images. - public virtual Dictionary Images { get; set; } + public Dictionary Images { get; set; } /// /// Gets or sets the date created.