Explorar el Código

use mbz id for last fm searches when we have it

Luke Pulverenti hace 11 años
padre
commit
981973a028

+ 1 - 32
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; }
         }
 
-        /// <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>

+ 3 - 3
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.