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

MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -108,6 +108,7 @@
     <Compile Include="IServerApplicationPaths.cs" />
     <Compile Include="Library\ChildrenChangedEventArgs.cs" />
     <Compile Include="Library\DtoBuilder.cs" />
+    <Compile Include="Providers\Music\FanArtArtistProvider.cs" />
     <Compile Include="Providers\Music\LastfmArtistProvider.cs" />
     <Compile Include="Providers\Music\LastfmBaseArtistProvider.cs" />
     <Compile Include="Resolvers\BaseItemResolver.cs" />

MediaBrowser.Controller/Providers/FanartBaseProvider.cs

@@ -1,4 +1,6 @@
-using MediaBrowser.Controller.Configuration;
+using System.Threading;
+using MediaBrowser.Controller.Configuration;
+using System.Collections.Generic;
 using MediaBrowser.Controller.Entities;
 using System;
 using MediaBrowser.Model.Logging;
@@ -10,27 +12,44 @@ namespace MediaBrowser.Controller.Providers
     /// </summary>
     public abstract class FanartBaseProvider : BaseMetadataProvider
     {
+
+        protected static readonly SemaphoreSlim FanArtResourcePool = new SemaphoreSlim(5,5);
+
         /// <summary>
         /// The LOG o_ FILE
         /// </summary>
         protected const string LOGO_FILE = "logo.png";
+
         /// <summary>
         /// The AR t_ FILE
         /// </summary>
         protected const string ART_FILE = "clearart.png";
+
         /// <summary>
         /// The THUM b_ FILE
         /// </summary>
         protected const string THUMB_FILE = "thumb.jpg";
+
         /// <summary>
         /// The DIS c_ FILE
         /// </summary>
         protected const string DISC_FILE = "disc.png";
+
         /// <summary>
         /// The BANNE r_ FILE
         /// </summary>
         protected const string BANNER_FILE = "banner.png";
 
+        /// <summary>
+        /// The Backdrop
+        /// </summary>
+        protected const string BACKDROP_FILE = "backdrop.jpg";
+
+        /// <summary>
+        /// The Primary image
+        /// </summary>
+        protected const string PRIMARY_FILE = "folder.jpg";
+
         /// <summary>
         /// The API key
         /// </summary>
@@ -60,10 +79,7 @@ namespace MediaBrowser.Controller.Providers
         /// <value><c>true</c> if [requires internet]; otherwise, <c>false</c>.</value>
         public override bool RequiresInternet
         {
-            get
+            get { return true; }
-            {
-                return true;
-            }
         }
 
         /// <summary>
@@ -85,6 +101,32 @@ namespace MediaBrowser.Controller.Providers
         {
             return false;
         }
+        #region Result Objects
+
+        protected class FanArtImageInfo
+        {
+            public string id { get; set; }
+            public string url { get; set; }
+            public string likes { get; set; }
+        }
+
+        protected class FanArtMusicInfo
+        {
+            public string mbid_id { get; set; }
+            public List<FanArtImageInfo> musiclogo { get; set; }
+            public List<FanArtImageInfo> artistbackground { get; set; }
+            public List<FanArtImageInfo> artistthumb { get; set; }
+            public List<FanArtImageInfo> hdmusiclogo { get; set; }
+            public List<FanArtImageInfo> musicbanner { get; set; }
+        }
+
+        protected class FanArtMusicResult
+        {
+            public FanArtMusicInfo result { get; set; }
+        }
+
+        #endregion
 
     }
+
 }

MediaBrowser.Controller/Providers/Music/FanArtArtistProvider.cs

@@ -0,0 +1,241 @@
+using System.Collections.Specialized;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+namespace MediaBrowser.Controller.Providers.Music
+{
+    /// <summary>
+    /// Class FanArtArtistProvider
+    /// </summary>
+    class FanArtArtistProvider : FanartBaseProvider
+    {
+        /// <summary>
+        /// Gets the HTTP client.
+        /// </summary>
+        /// <value>The HTTP client.</value>
+        protected IHttpClient HttpClient { get; private set; }
+
+        public FanArtArtistProvider(IHttpClient httpClient, ILogManager logManager, IServerConfigurationManager configurationManager)
+            : base(logManager, configurationManager)
+        {
+            if (httpClient == null)
+            {
+                throw new ArgumentNullException("httpClient");
+            }
+            HttpClient = httpClient;
+        }
+
+        /// <summary>
+        /// The fan art base URL
+        /// </summary>
+        protected string FanArtBaseUrl = "http://api.fanart.tv/webservice/artist/{0}/{1}/xml/all/1/1";
+
+        /// <summary>
+        /// Supportses the specified item.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
+        public override bool Supports(BaseItem item)
+        {
+            return item is MusicArtist;
+        }
+
+        /// <summary>
+        /// Shoulds the fetch.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="providerInfo">The provider info.</param>
+        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
+        protected override bool ShouldFetch(BaseItem item, BaseProviderInfo providerInfo)
+        {
+            var baseItem = item;
+            if (item.Path == null || item.DontFetchMeta || string.IsNullOrEmpty(baseItem.GetProviderId(MetadataProviders.Musicbrainz))) return false; //nothing to do
+            var artExists = item.ResolveArgs.ContainsMetaFileByName(ART_FILE);
+            var logoExists = item.ResolveArgs.ContainsMetaFileByName(LOGO_FILE);
+            var discExists = item.ResolveArgs.ContainsMetaFileByName(DISC_FILE);
+
+            return (!artExists && ConfigurationManager.Configuration.DownloadMovieArt)
+                || (!logoExists && ConfigurationManager.Configuration.DownloadMovieLogo)
+                || (!discExists && ConfigurationManager.Configuration.DownloadMovieDisc);
+        }
+
+        /// <summary>
+        /// Fetches metadata and returns true or false indicating if any work that requires persistence was done
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="force">if set to <c>true</c> [force].</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{System.Boolean}.</returns>
+        protected override async Task<bool> FetchAsyncInternal(BaseItem item, bool force, CancellationToken cancellationToken)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var artist = item;
+            if (ShouldFetch(artist, artist.ProviderData.GetValueOrDefault(Id, new BaseProviderInfo { ProviderId = Id })))
+            {
+                var url = string.Format(FanArtBaseUrl, APIKey, artist.GetProviderId(MetadataProviders.Musicbrainz));
+                var doc = new XmlDocument();
+
+                try
+                {
+                    using (var xml = await HttpClient.Get(url, FanArtResourcePool, cancellationToken).ConfigureAwait(false))
+                    {
+                        doc.Load(xml);
+                    }
+                }
+                catch (HttpException)
+                {
+                }
+
+                cancellationToken.ThrowIfCancellationRequested();
+
+                if (doc.HasChildNodes)
+                {
+                    string path;
+                    var hd = ConfigurationManager.Configuration.DownloadHDFanArt ? "hd" : "";
+                    if (ConfigurationManager.Configuration.DownloadMovieLogo && !item.ResolveArgs.ContainsMetaFileByName(LOGO_FILE))
+                    {
+                        var node =
+                            doc.SelectSingleNode("//fanart/music/musiclogos/" + hd + "musiclogo/@url") ??
+                            doc.SelectSingleNode("//fanart/music/musiclogos/musiclogo/@url");
+                        path = node != null ? node.Value : null;
+                        if (!string.IsNullOrEmpty(path))
+                        {
+                            Logger.Debug("FanArtProvider getting ClearLogo for " + artist.Name);
+                            try
+                            {
+                                artist.SetImage(ImageType.Logo, await Kernel.Instance.ProviderManager.DownloadAndSaveImage(artist, path, LOGO_FILE, FanArtResourcePool, cancellationToken).ConfigureAwait(false));
+                            }
+                            catch (HttpException)
+                            {
+                            }
+                            catch (IOException)
+                            {
+
+                            }
+                        }
+                    }
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    if (!item.ResolveArgs.ContainsMetaFileByName(BACKDROP_FILE))
+                    {
+                        var nodes = doc.SelectNodes("//fanart/music/artistbackgrounds//@url");
+                        if (nodes != null)
+                        {
+                            var numBackdrops = 0;
+                            foreach (XmlNode node in nodes)
+                            {
+                                path = node.Value;
+                                if (!string.IsNullOrEmpty(path))
+                                {
+                                    Logger.Debug("FanArtProvider getting Backdrop for " + artist.Name);
+                                    try
+                                    {
+                                        artist.BackdropImagePaths.Add(await Kernel.Instance.ProviderManager.DownloadAndSaveImage(artist, path, ("Backdrop"+(numBackdrops > 0 ? numBackdrops.ToString() : "")+".jpg"), FanArtResourcePool, cancellationToken).ConfigureAwait(false));
+                                        numBackdrops++;
+                                        if (numBackdrops >= ConfigurationManager.Configuration.MaxBackdrops) break;
+                                    }
+                                    catch (HttpException)
+                                    {
+                                    }
+                                    catch (IOException)
+                                    {
+
+                                    }
+                                }
+                            }
+                            
+                        }
+
+                    }
+
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    if (ConfigurationManager.Configuration.DownloadMovieArt && !item.ResolveArgs.ContainsMetaFileByName(ART_FILE))
+                    {
+                        var node =
+                            doc.SelectSingleNode("//fanart/music/musicarts/" + hd + "musicart/@url") ??
+                            doc.SelectSingleNode("//fanart/music/musicarts/musicart/@url");
+                        path = node != null ? node.Value : null;
+                        if (!string.IsNullOrEmpty(path))
+                        {
+                            Logger.Debug("FanArtProvider getting ClearArt for " + artist.Name);
+                            try
+                            {
+                                artist.SetImage(ImageType.Art, await Kernel.Instance.ProviderManager.DownloadAndSaveImage(artist, path, ART_FILE, FanArtResourcePool, cancellationToken).ConfigureAwait(false));
+                            }
+                            catch (HttpException)
+                            {
+                            }
+                            catch (IOException)
+                            {
+
+                            }
+                        }
+                    }
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    if (ConfigurationManager.Configuration.DownloadMovieBanner && !item.ResolveArgs.ContainsMetaFileByName(BANNER_FILE))
+                    {
+                        var node = doc.SelectSingleNode("//fanart/music/musicbanners/"+hd+"musicbanner/@url") ??
+                                   doc.SelectSingleNode("//fanart/music/musicbanners/musicbanner/@url");
+                        path = node != null ? node.Value : null;
+                        if (!string.IsNullOrEmpty(path))
+                        {
+                            Logger.Debug("FanArtProvider getting Banner for " + artist.Name);
+                            try
+                            {
+                                artist.SetImage(ImageType.Banner, await Kernel.Instance.ProviderManager.DownloadAndSaveImage(artist, path, BANNER_FILE, FanArtResourcePool, cancellationToken).ConfigureAwait(false));
+                            }
+                            catch (HttpException)
+                            {
+                            }
+                            catch (IOException)
+                            {
+
+                            }
+                        }
+                    }
+
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    // Artist thumbs are actually primary images (they are square/portrait)
+                    if (!item.ResolveArgs.ContainsMetaFileByName(PRIMARY_FILE))
+                    {
+                        var node = doc.SelectSingleNode("//fanart/music/artistthumbs/artistthumb/@url");
+                        path = node != null ? node.Value : null;
+                        if (!string.IsNullOrEmpty(path))
+                        {
+                            Logger.Debug("FanArtProvider getting Primary image for " + artist.Name);
+                            try
+                            {
+                                artist.SetImage(ImageType.Primary, await Kernel.Instance.ProviderManager.DownloadAndSaveImage(artist, path, PRIMARY_FILE, FanArtResourcePool, cancellationToken).ConfigureAwait(false));
+                            }
+                            catch (HttpException)
+                            {
+                            }
+                            catch (IOException)
+                            {
+
+                            }
+                        }
+                    }
+                }
+            }
+            SetLastRefreshed(artist, DateTime.UtcNow);
+            return true;
+        }
+    }
+}

MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs

@@ -7,6 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Model.Logging;
@@ -17,7 +18,6 @@ namespace MediaBrowser.Controller.Providers.Music
 {
     public class LastfmArtistProvider : LastfmBaseArtistProvider
     {
-        internal readonly SemaphoreSlim LastfmResourcePool = new SemaphoreSlim(5, 5);
 
         public LastfmArtistProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager, IServerConfigurationManager configurationManager)
             : base(jsonSerializer, httpClient, logManager, configurationManager)

MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs

@@ -24,6 +24,8 @@ namespace MediaBrowser.Controller.Providers.Music
     /// </summary>
     public abstract class LastfmBaseProvider : BaseMetadataProvider
     {
+        protected static readonly SemaphoreSlim LastfmResourcePool = new SemaphoreSlim(5, 5);
+
         /// <summary>
         /// Initializes a new instance of the <see cref="LastfmBaseProvider" /> class.
         /// </summary>
@@ -197,6 +199,8 @@ namespace MediaBrowser.Controller.Providers.Music
 
                 cancellationToken.ThrowIfCancellationRequested();
 
+                item.SetProviderId(MetadataProviders.Musicbrainz, id);
+
                 await FetchLastfmData(item, id, cancellationToken).ConfigureAwait(false);
             }
             else