standardize check of DontFetchMeta within provider manager

5 files changed, 8 insertions, 19 deletions

diff --git a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
index 051cea126..8a73e7ea9 100644
--- a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
+++ b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
@@ -204,8 +204,6 @@ namespace MediaBrowser.Controller.Providers
                 throw new ArgumentNullException("providerInfo");
             }
 
-            if (item.DontFetchMeta && RequiresInternet) return false;
-            
             if (CompareDate(item) > providerInfo.LastRefreshed)
             {
                 return true;
diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
index adbc4241f..83d57e5b9 100644
--- a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
@@ -244,8 +244,6 @@ namespace MediaBrowser.Controller.Providers.Movies
 
         protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo)
         {
-            if (item.DontFetchMeta) return false;
-
             if (HasAltMeta(item))
                 return false; //never refresh if has meta from other source
 
@@ -278,22 +276,10 @@ namespace MediaBrowser.Controller.Providers.Movies
                 SetLastRefreshed(item, DateTime.UtcNow);
                 return true;
             }
-            if (item.DontFetchMeta)
-            {
-                Logger.Info("MovieDbProvider - Not fetching because requested to ignore " + item.Name);
-                return false;
-            }
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            if (!ConfigurationManager.Configuration.SaveLocalMeta || !HasLocalMeta(item) || (force && !HasLocalMeta(item)))
-            {
-                await FetchMovieData(item, cancellationToken).ConfigureAwait(false);
-            }
-            else
-            {
-                Logger.Debug("MovieDBProvider not fetching because local meta exists for " + item.Name);
-            }
+            await FetchMovieData(item, cancellationToken).ConfigureAwait(false);
 
             SetLastRefreshed(item, DateTime.UtcNow);
             return true;
diff --git a/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
index 5be46aecc..a820d4bb1 100644
--- a/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
@@ -115,7 +115,7 @@ namespace MediaBrowser.Controller.Providers.TV
             cancellationToken.ThrowIfCancellationRequested();
             
             var episode = (Episode)item;
-            if (!item.DontFetchMeta && !HasLocalMeta(episode))
+            if (!HasLocalMeta(episode))
             {
                 var seriesId = episode.Series != null ? episode.Series.GetProviderId(MetadataProviders.Tvdb) : null;
 
diff --git a/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
index e3eb06963..8fec2778a 100644
--- a/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
@@ -148,7 +148,7 @@ namespace MediaBrowser.Controller.Providers.TV
             cancellationToken.ThrowIfCancellationRequested();
             
             var series = (Series)item;
-            if (!item.DontFetchMeta && !HasLocalMeta(series))
+            if (!HasLocalMeta(series))
             {
                 var path = item.Path ?? "";
                 var seriesId = Path.GetFileName(path).GetAttributeValue("tvdbid") ?? await GetSeriesId(series, cancellationToken);
diff --git a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
index 9e6a14442..5f1b4bd58 100644
--- a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
+++ b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
@@ -191,6 +191,11 @@ namespace MediaBrowser.Server.Implementations.Providers
                     continue;
                 }
 
+                if (provider.RequiresInternet && item.DontFetchMeta)
+                {
+                    continue;
+                }
+
                 currentTasks.Add(FetchAsync(provider, item, force, cancellationToken));
                 currentPriority = provider.Priority;
             }