fixes #979 - Support personal fanart api key

6 files changed, 39 insertions, 3 deletions

diff --git a/MediaBrowser.Providers/Movies/FanArtMovieUpdatesPostScanTask.cs b/MediaBrowser.Providers/Movies/FanArtMovieUpdatesPostScanTask.cs
index 2936fec0ec..2f3d8ceeae 100644
--- a/MediaBrowser.Providers/Movies/FanArtMovieUpdatesPostScanTask.cs
+++ b/MediaBrowser.Providers/Movies/FanArtMovieUpdatesPostScanTask.cs
@@ -98,10 +98,17 @@ namespace MediaBrowser.Providers.Movies
 
         private async Task<IEnumerable<string>> GetMovieIdsToUpdate(IEnumerable<string> existingIds, string lastUpdateTime, CancellationToken cancellationToken)
         {
+            var url = string.Format(UpdatesUrl, FanartArtistProvider.ApiKey, lastUpdateTime);
+
+            if (!string.IsNullOrWhiteSpace(_config.Configuration.FanartApiKey))
+            {
+                url += "&client_key=" + _config.Configuration.FanartApiKey;
+            }
+
             // First get last time
             using (var stream = await _httpClient.Get(new HttpRequestOptions
             {
-                Url = string.Format(UpdatesUrl, FanartArtistProvider.ApiKey, lastUpdateTime),
+                Url = url,
                 CancellationToken = cancellationToken,
                 EnableHttpCompression = true,
                 ResourcePool = FanartArtistProvider.Current.FanArtResourcePool
diff --git a/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs b/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs
index 6813f2ff5e..91d8830e60 100644
--- a/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs
+++ b/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs
@@ -283,6 +283,11 @@ namespace MediaBrowser.Providers.Movies
 
             var url = string.Format(FanArtBaseUrl, FanartArtistProvider.ApiKey, id);
 
+            if (!string.IsNullOrWhiteSpace(_config.Configuration.FanartApiKey))
+            {
+                url += "&client_key=" + _config.Configuration.FanartApiKey;
+            }
+
             var path = GetFanartJsonPath(id);
 
             Directory.CreateDirectory(Path.GetDirectoryName(path));
diff --git a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
index 6f633cfc87..6bb4b0aeff 100644
--- a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
+++ b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
@@ -423,6 +423,11 @@ namespace MediaBrowser.Providers.Music
 
             var url = string.Format(FanArtBaseUrl, ApiKey, musicBrainzId);
 
+            if (!string.IsNullOrWhiteSpace(_config.Configuration.FanartApiKey))
+            {
+                url += "&client_key=" + _config.Configuration.FanartApiKey;
+            }
+
             var xmlPath = GetArtistXmlPath(_config.ApplicationPaths, musicBrainzId);
 
             Directory.CreateDirectory(Path.GetDirectoryName(xmlPath));
diff --git a/MediaBrowser.Providers/Music/FanArtUpdatesPostScanTask.cs b/MediaBrowser.Providers/Music/FanArtUpdatesPostScanTask.cs
index 4c6706287c..703153e319 100644
--- a/MediaBrowser.Providers/Music/FanArtUpdatesPostScanTask.cs
+++ b/MediaBrowser.Providers/Music/FanArtUpdatesPostScanTask.cs
@@ -104,10 +104,17 @@ namespace MediaBrowser.Providers.Music
         /// <returns>Task{IEnumerable{System.String}}.</returns>
         private async Task<IEnumerable<string>> GetArtistIdsToUpdate(IEnumerable<string> existingArtistIds, string lastUpdateTime, CancellationToken cancellationToken)
         {
+            var url = string.Format(UpdatesUrl, FanartArtistProvider.ApiKey, lastUpdateTime);
+
+            if (!string.IsNullOrWhiteSpace(_config.Configuration.FanartApiKey))
+            {
+                url += "&client_key=" + _config.Configuration.FanartApiKey;
+            }
+            
             // First get last time
             using (var stream = await _httpClient.Get(new HttpRequestOptions
             {
-                Url = string.Format(UpdatesUrl, FanartArtistProvider.ApiKey, lastUpdateTime),
+                Url = url,
                 CancellationToken = cancellationToken,
                 EnableHttpCompression = true,
                 ResourcePool = FanartArtistProvider.Current.FanArtResourcePool
diff --git a/MediaBrowser.Providers/TV/FanArtTvUpdatesPostScanTask.cs b/MediaBrowser.Providers/TV/FanArtTvUpdatesPostScanTask.cs
index 13920d942d..567f3b5daa 100644
--- a/MediaBrowser.Providers/TV/FanArtTvUpdatesPostScanTask.cs
+++ b/MediaBrowser.Providers/TV/FanArtTvUpdatesPostScanTask.cs
@@ -105,10 +105,17 @@ namespace MediaBrowser.Providers.TV
         /// <returns>Task{IEnumerable{System.String}}.</returns>
         private async Task<IEnumerable<string>> GetSeriesIdsToUpdate(IEnumerable<string> existingSeriesIds, string lastUpdateTime, CancellationToken cancellationToken)
         {
+            var url = string.Format(UpdatesUrl, FanartArtistProvider.ApiKey, lastUpdateTime);
+
+            if (!string.IsNullOrWhiteSpace(_config.Configuration.FanartApiKey))
+            {
+                url += "&client_key=" + _config.Configuration.FanartApiKey;
+            }
+
             // First get last time
             using (var stream = await _httpClient.Get(new HttpRequestOptions
             {
-                Url = string.Format(UpdatesUrl, FanartArtistProvider.ApiKey, lastUpdateTime),
+                Url = url,
                 CancellationToken = cancellationToken,
                 EnableHttpCompression = true,
                 ResourcePool = FanartArtistProvider.Current.FanArtResourcePool
diff --git a/MediaBrowser.Providers/TV/FanartSeriesProvider.cs b/MediaBrowser.Providers/TV/FanartSeriesProvider.cs
index 8ba25e9f1f..f95b6b2c68 100644
--- a/MediaBrowser.Providers/TV/FanartSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/FanartSeriesProvider.cs
@@ -295,6 +295,11 @@ namespace MediaBrowser.Providers.TV
 
             var url = string.Format(FanArtBaseUrl, FanartArtistProvider.ApiKey, tvdbId);
 
+            if (!string.IsNullOrWhiteSpace(_config.Configuration.FanartApiKey))
+            {
+                url += "&client_key=" + _config.Configuration.FanartApiKey;
+            }
+            
             var path = GetFanartJsonPath(tvdbId);
 
             Directory.CreateDirectory(Path.GetDirectoryName(path));