fixes #360 - Series.xml not being read correctly

2 files changed, 6 insertions, 18 deletions

diff --git a/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs b/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs
index 6e8531b07..32345cd09 100644
--- a/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs
@@ -111,8 +111,8 @@ namespace MediaBrowser.Providers.TV
         /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
         protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo)
         {
-            // Don't proceed if there's local metadata and save local is off, as it's likely from another source
-            if (HasLocalMeta(item) && !ConfigurationManager.Configuration.SaveLocalMeta)
+            // Don't proceed if there's local metadata
+            if (HasLocalMeta(item))
             {
                 return false;
             }
@@ -151,12 +151,6 @@ namespace MediaBrowser.Providers.TV
         /// <returns>Task{System.Boolean}.</returns>
         public override async Task<bool> FetchAsync(BaseItem item, bool force, CancellationToken cancellationToken)
         {
-            // Don't proceed if there's local metadata and save local is off, as it's likely from another source
-            if (HasLocalMeta(item) && !ConfigurationManager.Configuration.SaveLocalMeta)
-            {
-                return false;
-            }
-
             cancellationToken.ThrowIfCancellationRequested();
 
             var episode = (Episode)item;
diff --git a/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs b/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs
index 6bf0a00d9..bb32c488e 100644
--- a/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs
@@ -213,7 +213,7 @@ namespace MediaBrowser.Providers.TV
 
                 var seriesDataPath = GetSeriesDataPath(ConfigurationManager.ApplicationPaths, seriesId);
 
-                await FetchSeriesData(series, seriesId, seriesDataPath, cancellationToken).ConfigureAwait(false);
+                await FetchSeriesData(series, seriesId, seriesDataPath, force, cancellationToken).ConfigureAwait(false);
             }
 
             BaseProviderInfo data;
@@ -233,9 +233,10 @@ namespace MediaBrowser.Providers.TV
         /// <param name="series">The series.</param>
         /// <param name="seriesId">The series id.</param>
         /// <param name="seriesDataPath">The series data path.</param>
+        /// <param name="isForcedRefresh">if set to <c>true</c> [is forced refresh].</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{System.Boolean}.</returns>
-        private async Task FetchSeriesData(Series series, string seriesId, string seriesDataPath, CancellationToken cancellationToken)
+        private async Task FetchSeriesData(Series series, string seriesId, string seriesDataPath, bool isForcedRefresh, CancellationToken cancellationToken)
         {
             var files = Directory.EnumerateFiles(seriesDataPath, "*.xml", SearchOption.TopDirectoryOnly).Select(Path.GetFileName).ToArray();
 
@@ -249,7 +250,7 @@ namespace MediaBrowser.Providers.TV
             }
 
             // Examine if there's no local metadata, or save local is on (to get updates)
-            if (!HasLocalMeta(series) || ConfigurationManager.Configuration.SaveLocalMeta)
+            if (!HasLocalMeta(series) || isForcedRefresh)
             {
                 var seriesXmlPath = Path.Combine(seriesDataPath, seriesXmlFilename);
                 var actorsXmlPath = Path.Combine(seriesDataPath, "actors.xml");
@@ -265,13 +266,6 @@ namespace MediaBrowser.Providers.TV
 
                     FetchActors(series, actorsDoc, seriesDoc);
                 }
-                if (ConfigurationManager.Configuration.SaveLocalMeta)
-                {
-                    //var ms = new MemoryStream();
-                    //seriesDoc.Save(ms);
-
-                    //await _providerManager.SaveToLibraryFilesystem(series, Path.Combine(series.MetaLocation, LocalMetaFileName), ms, cancellationToken).ConfigureAwait(false);
-                }
             }
         }