Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

3 files changed, 24 insertions, 0 deletions

diff --git a/MediaBrowser.Controller/Entities/Audio/Artist.cs b/MediaBrowser.Controller/Entities/Audio/Artist.cs
index 567b678685..6052a277e3 100644
--- a/MediaBrowser.Controller/Entities/Audio/Artist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Artist.cs
@@ -14,5 +14,11 @@ namespace MediaBrowser.Controller.Entities.Audio
         {
             return "Artist-" + Name;
         }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is on tour.
+        /// </summary>
+        /// <value><c>true</c> if this instance is on tour; otherwise, <c>false</c>.</value>
+        public bool IsOnTour { get; set; }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index d93aec94cc..859910ae69 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -139,5 +139,15 @@ namespace MediaBrowser.Controller.Entities.Audio
                 base.Images = value;
             }
         }
+
+        /// <summary>
+        /// Determines whether the specified artist has artist.
+        /// </summary>
+        /// <param name="artist">The artist.</param>
+        /// <returns><c>true</c> if the specified artist has artist; otherwise, <c>false</c>.</returns>
+        public bool HasArtist(string artist)
+        {
+            return Children.OfType<Audio>().Any(i => i.HasArtist(artist));
+        }
     }
 }
diff --git a/MediaBrowser.Controller/Providers/Music/LastfmHelper.cs b/MediaBrowser.Controller/Providers/Music/LastfmHelper.cs
index 442dd4b694..1a4cf407bf 100644
--- a/MediaBrowser.Controller/Providers/Music/LastfmHelper.cs
+++ b/MediaBrowser.Controller/Providers/Music/LastfmHelper.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Model.Entities;
 using System;
 
@@ -31,6 +32,13 @@ namespace MediaBrowser.Controller.Providers.Music
             {
                 AddGenres(artist, data.tags);
             }
+
+            var entity = artist as Artist;
+
+            if (entity != null)
+            {
+                entity.IsOnTour = string.Equals(data.ontour, "1");
+            }
         }
 
         public static void ProcessAlbumData(BaseItem item, LastfmAlbum data)