use music brainz values from audio files with bottom up refresh

3 files changed, 61 insertions, 2 deletions

diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index 6dda902c9e..8b8c1a6ff4 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -22,6 +22,15 @@ namespace MediaBrowser.Controller.Entities.Audio
             Tags = new List<string>();
         }
 
+        [IgnoreDataMember]
+        public MusicArtist MusicArtist
+        {
+            get
+            {
+                return Parents.OfType<MusicArtist>().FirstOrDefault();
+            }
+        }
+
         /// <summary>
         /// Gets or sets the tags.
         /// </summary>
@@ -99,7 +108,7 @@ namespace MediaBrowser.Controller.Entities.Audio
                 return "MusicAlbum-MusicBrainzReleaseGroup-" + id;
             }
 
-            id = this.GetProviderId(MetadataProviders.Musicbrainz);
+            id = this.GetProviderId(MetadataProviders.MusicBrainzAlbum);
 
             if (!string.IsNullOrEmpty(id))
             {
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
index 570a011c29..e80aaa69a3 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
@@ -90,13 +90,38 @@ namespace MediaBrowser.Controller.Entities.Audio
         }
 
         /// <summary>
+        /// Returns the folder containing the item.
+        /// If the item is a folder, it returns the folder itself
+        /// </summary>
+        /// <value>The containing folder path.</value>
+        public override string ContainingFolderPath
+        {
+            get
+            {
+                return Path;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is owned item.
+        /// </summary>
+        /// <value><c>true</c> if this instance is owned item; otherwise, <c>false</c>.</value>
+        public override bool IsOwnedItem
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
         /// Gets the user data key.
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>System.String.</returns>
         private static string GetUserDataKey(MusicArtist item)
         {
-            var id = item.GetProviderId(MetadataProviders.Musicbrainz);
+            var id = item.GetProviderId(MetadataProviders.MusicBrainzArtist);
 
             if (!string.IsNullOrEmpty(id))
             {
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
index b54e14f2da..5e1d4c3c9c 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
@@ -26,5 +26,30 @@ namespace MediaBrowser.Controller.Entities.Audio
 
         [IgnoreDataMember]
         public List<ItemByNameCounts> UserItemCountList { get; set; }
+
+        /// <summary>
+        /// Returns the folder containing the item.
+        /// If the item is a folder, it returns the folder itself
+        /// </summary>
+        /// <value>The containing folder path.</value>
+        public override string ContainingFolderPath
+        {
+            get
+            {
+                return Path;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is owned item.
+        /// </summary>
+        /// <value><c>true</c> if this instance is owned item; otherwise, <c>false</c>.</value>
+        public override bool IsOwnedItem
+        {
+            get
+            {
+                return false;
+            }
+        }
     }
 }