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

6 files changed, 47 insertions, 58 deletions

diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
index d5df769a9..7e266a928 100644
--- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
@@ -54,7 +54,6 @@ namespace MediaBrowser.Controller.Providers
                 CheckCharacters = false,
                 IgnoreProcessingInstructions = true,
                 IgnoreComments = true,
-                IgnoreWhitespace = true,
                 ValidationType = ValidationType.None
             };
 
diff --git a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
index b69ece418..dd03c88de 100644
--- a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
+++ b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
@@ -31,6 +31,12 @@ namespace MediaBrowser.Controller.Providers
         /// </summary>
         protected readonly Guid Id;
 
+        /// <summary>
+        /// The true task result
+        /// </summary>
+        protected static readonly Task<bool> TrueTaskResult = Task.FromResult(true);
+        protected static readonly Task<bool> FalseTaskResult = Task.FromResult(false);
+
         protected static readonly SemaphoreSlim XmlParsingResourcePool = new SemaphoreSlim(5, 5);
         
         /// <summary>
@@ -207,7 +213,7 @@ namespace MediaBrowser.Controller.Providers
                 return true;
             }
 
-            if (RefreshOnVersionChange && !string.Equals(ProviderVersion, providerInfo.ProviderVersion))
+            if (RefreshOnVersionChange && !String.Equals(ProviderVersion, providerInfo.ProviderVersion))
             {
                 return true;
             }
@@ -223,7 +229,7 @@ namespace MediaBrowser.Controller.Providers
         /// <returns><c>true</c> if [has file system stamp changed] [the specified item]; otherwise, <c>false</c>.</returns>
         protected bool HasFileSystemStampChanged(BaseItem item, BaseProviderInfo providerInfo)
         {
-            return !string.Equals(GetCurrentFileSystemStamp(item), providerInfo.FileSystemStamp);
+            return !String.Equals(GetCurrentFileSystemStamp(item), providerInfo.FileSystemStamp);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
index 465cfec92..f11ba8f97 100644
--- a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
+++ b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
@@ -53,11 +53,6 @@ namespace MediaBrowser.Controller.Providers
         }
 
         /// <summary>
-        /// The true task result
-        /// </summary>
-        protected static readonly Task<bool> TrueTaskResult = Task.FromResult(true);
-
-        /// <summary>
         /// Fetches metadata and returns true or false indicating if any work that requires persistence was done
         /// </summary>
         /// <param name="item">The item.</param>
diff --git a/MediaBrowser.Controller/Providers/Movies/MovieProviderFromJson.cs b/MediaBrowser.Controller/Providers/Movies/MovieProviderFromJson.cs
index b81e0c51d..4529e4890 100644
--- a/MediaBrowser.Controller/Providers/Movies/MovieProviderFromJson.cs
+++ b/MediaBrowser.Controller/Providers/Movies/MovieProviderFromJson.cs
@@ -81,26 +81,22 @@ namespace MediaBrowser.Controller.Providers.Movies
         /// <returns>Task{System.Boolean}.</returns>
         public override Task<bool> FetchAsync(BaseItem item, bool force, CancellationToken cancellationToken)
         {
-            // Since we don't have anything truly async, and since deserializing can be expensive, create a task to force parallelism
-            return Task.Run(() =>
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var entry = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, LOCAL_META_FILE_NAME));
+            if (entry.HasValue)
             {
-                cancellationToken.ThrowIfCancellationRequested();
-                
-                var entry = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, LOCAL_META_FILE_NAME));
-                if (entry.HasValue)
-                {
-                    // read in our saved meta and pass to processing function
-                    var movieData = JsonSerializer.DeserializeFromFile<CompleteMovieData>(entry.Value.Path);
+                // read in our saved meta and pass to processing function
+                var movieData = JsonSerializer.DeserializeFromFile<CompleteMovieData>(entry.Value.Path);
 
-                    cancellationToken.ThrowIfCancellationRequested();
+                cancellationToken.ThrowIfCancellationRequested();
 
-                    ProcessMainInfo(item, movieData);
+                ProcessMainInfo(item, movieData);
 
-                    SetLastRefreshed(item, DateTime.UtcNow);
-                    return true;
-                }
-                return false;
-            });
+                SetLastRefreshed(item, DateTime.UtcNow);
+                return TrueTaskResult;
+            }
+            return FalseTaskResult;
         }
     }
 }
diff --git a/MediaBrowser.Controller/Providers/Movies/PersonProviderFromJson.cs b/MediaBrowser.Controller/Providers/Movies/PersonProviderFromJson.cs
index e89f1a044..1860f16c2 100644
--- a/MediaBrowser.Controller/Providers/Movies/PersonProviderFromJson.cs
+++ b/MediaBrowser.Controller/Providers/Movies/PersonProviderFromJson.cs
@@ -92,28 +92,24 @@ namespace MediaBrowser.Controller.Providers.Movies
         /// <returns>Task{System.Boolean}.</returns>
         public override Task<bool> FetchAsync(BaseItem item, bool force, CancellationToken cancellationToken)
         {
-            return Task.Run(() =>
-            {
-                cancellationToken.ThrowIfCancellationRequested();
+            cancellationToken.ThrowIfCancellationRequested();
 
-                try
-                {
-                    var personInfo = JsonSerializer.DeserializeFromFile<PersonResult>(Path.Combine(item.MetaLocation, MetaFileName));
+            try
+            {
+                var personInfo = JsonSerializer.DeserializeFromFile<PersonResult>(Path.Combine(item.MetaLocation, MetaFileName));
 
-                    cancellationToken.ThrowIfCancellationRequested();
-                
-                    ProcessInfo((Person)item, personInfo);
+                cancellationToken.ThrowIfCancellationRequested();
 
-                    SetLastRefreshed(item, DateTime.UtcNow);
-                    return true;
-                }
-                catch (FileNotFoundException)
-                {
-                    // This is okay - just means we force refreshed and there isn't a json file
-                    return false;
-                }
+                ProcessInfo((Person)item, personInfo);
 
-            });
+                SetLastRefreshed(item, DateTime.UtcNow);
+                return TrueTaskResult;
+            }
+            catch (FileNotFoundException)
+            {
+                // This is okay - just means we force refreshed and there isn't a json file
+                return FalseTaskResult;
+            }
         }
     }
 }
diff --git a/MediaBrowser.Controller/Providers/Music/MusicArtistProviderFromJson.cs b/MediaBrowser.Controller/Providers/Music/MusicArtistProviderFromJson.cs
index 6ff6a5182..ce96cd107 100644
--- a/MediaBrowser.Controller/Providers/Music/MusicArtistProviderFromJson.cs
+++ b/MediaBrowser.Controller/Providers/Music/MusicArtistProviderFromJson.cs
@@ -32,27 +32,24 @@ namespace MediaBrowser.Controller.Providers.Music
 
         public override Task<bool> FetchAsync(BaseItem item, bool force, CancellationToken cancellationToken)
         {
-            return Task.Run(() =>
-            {
-                cancellationToken.ThrowIfCancellationRequested();
+            cancellationToken.ThrowIfCancellationRequested();
 
-                var entry = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, LastfmHelper.LocalArtistMetaFileName));
-                if (entry.HasValue)
-                {
-                    // read in our saved meta and pass to processing function
-                    var data = JsonSerializer.DeserializeFromFile<LastfmArtist>(entry.Value.Path);
+            var entry = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, LastfmHelper.LocalArtistMetaFileName));
+            if (entry.HasValue)
+            {
+                // read in our saved meta and pass to processing function
+                var data = JsonSerializer.DeserializeFromFile<LastfmArtist>(entry.Value.Path);
 
-                    cancellationToken.ThrowIfCancellationRequested();
+                cancellationToken.ThrowIfCancellationRequested();
 
-                    LastfmHelper.ProcessArtistData(item, data);
+                LastfmHelper.ProcessArtistData(item, data);
 
-                    item.SetProviderId(MetadataProviders.Musicbrainz, data.mbid);
+                item.SetProviderId(MetadataProviders.Musicbrainz, data.mbid);
 
-                    SetLastRefreshed(item, DateTime.UtcNow);
-                    return true;
-                }
-                return false;
-            });
+                SetLastRefreshed(item, DateTime.UtcNow);
+                return TrueTaskResult;
+            }
+            return FalseTaskResult;
         }
 
         public override MetadataProviderPriority Priority