update environment detection

3 files changed, 22 insertions, 33 deletions

diff --git a/MediaBrowser.Providers/ImagesByName/ImageUtils.cs b/MediaBrowser.Providers/ImagesByName/ImageUtils.cs
index bbcbbda90..6c51d5bd7 100644
--- a/MediaBrowser.Providers/ImagesByName/ImageUtils.cs
+++ b/MediaBrowser.Providers/ImagesByName/ImageUtils.cs
@@ -6,8 +6,6 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
 
 namespace MediaBrowser.Providers.ImagesByName
@@ -21,36 +19,37 @@ namespace MediaBrowser.Providers.ImagesByName
         /// <param name="file">The file.</param>
         /// <param name="httpClient">The HTTP client.</param>
         /// <param name="fileSystem">The file system.</param>
-        /// <param name="semaphore">The semaphore.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        public static async Task EnsureList(string url, string file, IHttpClient httpClient, IFileSystem fileSystem, SemaphoreSlim semaphore, CancellationToken cancellationToken)
+        public static async Task<string> EnsureList(string url, string file, IHttpClient httpClient, IFileSystem fileSystem, CancellationToken cancellationToken)
         {
             var fileInfo = fileSystem.GetFileInfo(file);
 
             if (!fileInfo.Exists || (DateTime.UtcNow - fileSystem.GetLastWriteTimeUtc(fileInfo)).TotalDays > 1)
             {
-                await semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-                try
+                var temp = await httpClient.GetTempFile(new HttpRequestOptions
                 {
-                    var temp = await httpClient.GetTempFile(new HttpRequestOptions
-                    {
-                        CancellationToken = cancellationToken,
-                        Progress = new Progress<double>(),
-                        Url = url
+                    CancellationToken = cancellationToken,
+                    Progress = new Progress<double>(),
+                    Url = url
 
-                    }).ConfigureAwait(false);
+                }).ConfigureAwait(false);
 
-					fileSystem.CreateDirectory(Path.GetDirectoryName(file));
+                fileSystem.CreateDirectory(Path.GetDirectoryName(file));
 
-					fileSystem.CopyFile(temp, file, true);
+                try
+                {
+                    fileSystem.CopyFile(temp, file, true);
                 }
-                finally
+                catch
                 {
-                    semaphore.Release();
+                    
                 }
+
+                return temp;
             }
+
+            return file;
         }
 
         public static string FindMatch(IHasImages item, IEnumerable<string> images)
diff --git a/MediaBrowser.Providers/Manager/ProviderUtils.cs b/MediaBrowser.Providers/Manager/ProviderUtils.cs
index 34cf63350..13c12c8ff 100644
--- a/MediaBrowser.Providers/Manager/ProviderUtils.cs
+++ b/MediaBrowser.Providers/Manager/ProviderUtils.cs
@@ -265,11 +265,6 @@ namespace MediaBrowser.Providers.Manager
             {
                 target.CriticRating = source.CriticRating;
             }
-
-            if (replaceData || string.IsNullOrEmpty(target.CriticRatingSummary))
-            {
-                target.CriticRatingSummary = source.CriticRatingSummary;
-            }
         }
 
         private static void MergeTrailers(BaseItem source, BaseItem target, List<MetadataFields> lockedFields, bool replaceData)
diff --git a/MediaBrowser.Providers/Studios/StudiosImageProvider.cs b/MediaBrowser.Providers/Studios/StudiosImageProvider.cs
index bf017d148..8579bd16b 100644
--- a/MediaBrowser.Providers/Studios/StudiosImageProvider.cs
+++ b/MediaBrowser.Providers/Studios/StudiosImageProvider.cs
@@ -4,15 +4,12 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Providers;
-using MediaBrowser.Providers.Genres;
 using MediaBrowser.Providers.ImagesByName;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
 
 namespace MediaBrowser.Providers.Studios
@@ -23,8 +20,6 @@ namespace MediaBrowser.Providers.Studios
         private readonly IHttpClient _httpClient;
         private readonly IFileSystem _fileSystem;
 
-        private readonly SemaphoreSlim _listResourcePool = new SemaphoreSlim(1, 1);
-
         public StudiosImageProvider(IServerConfigurationManager config, IHttpClient httpClient, IFileSystem fileSystem)
         {
             _config = config;
@@ -69,7 +64,7 @@ namespace MediaBrowser.Providers.Studios
             {
                 var posterPath = Path.Combine(_config.ApplicationPaths.CachePath, "imagesbyname", "remotestudioposters.txt");
 
-                await EnsurePosterList(posterPath, cancellationToken).ConfigureAwait(false);
+                posterPath = await EnsurePosterList(posterPath, cancellationToken).ConfigureAwait(false);
 
                 list.Add(GetImage(item, posterPath, ImageType.Primary, "folder"));
             }
@@ -80,7 +75,7 @@ namespace MediaBrowser.Providers.Studios
             {
                 var thumbsPath = Path.Combine(_config.ApplicationPaths.CachePath, "imagesbyname", "remotestudiothumbs.txt");
 
-                await EnsureThumbsList(thumbsPath, cancellationToken).ConfigureAwait(false);
+                thumbsPath = await EnsureThumbsList(thumbsPath, cancellationToken).ConfigureAwait(false);
 
                 list.Add(GetImage(item, thumbsPath, ImageType.Thumb, "thumb"));
             }
@@ -114,18 +109,18 @@ namespace MediaBrowser.Providers.Studios
             return string.Format("https://raw.github.com/MediaBrowser/MediaBrowser.Resources/master/images/imagesbyname/studios/{0}/{1}.jpg", image, filename);
         }
 
-        private Task EnsureThumbsList(string file, CancellationToken cancellationToken)
+        private Task<string> EnsureThumbsList(string file, CancellationToken cancellationToken)
         {
             const string url = "https://raw.github.com/MediaBrowser/MediaBrowser.Resources/master/images/imagesbyname/studiothumbs.txt";
 
-            return ImageUtils.EnsureList(url, file, _httpClient, _fileSystem, _listResourcePool, cancellationToken);
+            return ImageUtils.EnsureList(url, file, _httpClient, _fileSystem, cancellationToken);
         }
 
-        private Task EnsurePosterList(string file, CancellationToken cancellationToken)
+        private Task<string> EnsurePosterList(string file, CancellationToken cancellationToken)
         {
             const string url = "https://raw.github.com/MediaBrowser/MediaBrowser.Resources/master/images/imagesbyname/studioposters.txt";
 
-            return ImageUtils.EnsureList(url, file, _httpClient, _fileSystem, _listResourcePool, cancellationToken);
+            return ImageUtils.EnsureList(url, file, _httpClient, _fileSystem, cancellationToken);
         }
 
         public int Order