ease up on RefreshOnFileSystemStampChange

8 files changed, 18 insertions, 69 deletions

diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs
index f8f8cdb09..5f24aa1e0 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs
@@ -60,6 +60,7 @@ namespace MediaBrowser.Providers.MediaInfo
         {
             get
             {
+                // Need this in case external subtitle files change
                 return true;
             }
         }
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index 5e23ca7d6..b25a61c4e 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -116,17 +116,6 @@ namespace MediaBrowser.Providers.Movies
             }
         }
 
-        /// <summary>
-        /// If we save locally, refresh if they delete something
-        /// </summary>
-        protected override bool RefreshOnFileSystemStampChange
-        {
-            get
-            {
-                return ConfigurationManager.Configuration.SaveLocalMeta;
-            }
-        }
-
         protected override bool RefreshOnVersionChange
         {
             get
@@ -275,17 +264,6 @@ namespace MediaBrowser.Providers.Movies
         }
 
         /// <summary>
-        /// Determines whether [has local meta] [the specified item].
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns><c>true</c> if [has local meta] [the specified item]; otherwise, <c>false</c>.</returns>
-        private bool HasLocalMeta(BaseItem item)
-        {
-            //need at least the xml and folder.jpg/png or a movie.xml put in by someone else
-            return item.LocationType == LocationType.FileSystem && item.ResolveArgs.ContainsMetaFileByName(LocalMetaFileName);
-        }
-
-        /// <summary>
         /// Determines whether [has alt meta] [the specified item].
         /// </summary>
         /// <param name="item">The item.</param>
diff --git a/MediaBrowser.Providers/Music/LastfmAlbumProvider.cs b/MediaBrowser.Providers/Music/LastfmAlbumProvider.cs
index b48a2c9e3..af277b5fc 100644
--- a/MediaBrowser.Providers/Music/LastfmAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/LastfmAlbumProvider.cs
@@ -21,7 +21,12 @@ namespace MediaBrowser.Providers.Music
         private static readonly Task<string> BlankId = Task.FromResult("");
 
         private readonly IProviderManager _providerManager;
-        
+
+        /// <summary>
+        /// The name of the local json meta file for this item type
+        /// </summary>
+        protected string LocalMetaFileName { get; set; }
+
         public LastfmAlbumProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager, IServerConfigurationManager configurationManager, IProviderManager providerManager)
             : base(jsonSerializer, httpClient, logManager, configurationManager)
         {
@@ -132,14 +137,6 @@ namespace MediaBrowser.Providers.Music
             return item is MusicAlbum;
         }
 
-        protected override bool RefreshOnFileSystemStampChange
-        {
-            get
-            {
-                return true;
-            }
-        }
-
         /// <summary>
         /// Gets the data.
         /// </summary>
diff --git a/MediaBrowser.Providers/Music/LastfmArtistProvider.cs b/MediaBrowser.Providers/Music/LastfmArtistProvider.cs
index aff6f1df9..0281b8c0b 100644
--- a/MediaBrowser.Providers/Music/LastfmArtistProvider.cs
+++ b/MediaBrowser.Providers/Music/LastfmArtistProvider.cs
@@ -36,6 +36,11 @@ namespace MediaBrowser.Providers.Music
         protected readonly ILibraryManager LibraryManager;
 
         /// <summary>
+        /// The name of the local json meta file for this item type
+        /// </summary>
+        protected string LocalMetaFileName { get; set; }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="LastfmArtistProvider"/> class.
         /// </summary>
         /// <param name="jsonSerializer">The json serializer.</param>
diff --git a/MediaBrowser.Providers/Music/LastfmBaseProvider.cs b/MediaBrowser.Providers/Music/LastfmBaseProvider.cs
index b90dc9453..765911383 100644
--- a/MediaBrowser.Providers/Music/LastfmBaseProvider.cs
+++ b/MediaBrowser.Providers/Music/LastfmBaseProvider.cs
@@ -71,11 +71,6 @@ namespace MediaBrowser.Providers.Music
         /// <value>The HTTP client.</value>
         protected IHttpClient HttpClient { get; private set; }
 
-        /// <summary>
-        /// The name of the local json meta file for this item type
-        /// </summary>
-        protected string LocalMetaFileName { get; set; }
-
         protected virtual bool SaveLocalMeta
         {
             get
@@ -85,17 +80,6 @@ namespace MediaBrowser.Providers.Music
         }
 
         /// <summary>
-        /// If we save locally, refresh if they delete something
-        /// </summary>
-        protected override bool RefreshOnFileSystemStampChange
-        {
-            get
-            {
-                return SaveLocalMeta;
-            }
-        }
-
-        /// <summary>
         /// Gets the priority.
         /// </summary>
         /// <value>The priority.</value>
@@ -120,16 +104,6 @@ namespace MediaBrowser.Providers.Music
         protected static string ApiKey = "7b76553c3eb1d341d642755aecc40a33";
 
         /// <summary>
-        /// Determines whether [has local meta] [the specified item].
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns><c>true</c> if [has local meta] [the specified item]; otherwise, <c>false</c>.</returns>
-        protected bool HasLocalMeta(BaseItem item)
-        {
-            return item.ResolveArgs.ContainsMetaFileByName(LocalMetaFileName);
-        }
-
-        /// <summary>
         /// Fetches the items data.
         /// </summary>
         /// <param name="item">The item.</param>
diff --git a/MediaBrowser.Providers/TV/EpisodeProviderFromXml.cs b/MediaBrowser.Providers/TV/EpisodeProviderFromXml.cs
index eb549759a..bbfa0a3bf 100644
--- a/MediaBrowser.Providers/TV/EpisodeProviderFromXml.cs
+++ b/MediaBrowser.Providers/TV/EpisodeProviderFromXml.cs
@@ -40,14 +40,6 @@ namespace MediaBrowser.Providers.TV
             get { return MetadataProviderPriority.First; }
         }
 
-        protected override bool RefreshOnFileSystemStampChange
-        {
-            get
-            {
-                return true;
-            }
-        }
-
         /// <summary>
         /// Fetches metadata and returns true or false indicating if any work that requires persistence was done
         /// </summary>
diff --git a/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs b/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs
index 5aac3e075..f849d85ec 100644
--- a/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs
@@ -121,7 +121,8 @@ namespace MediaBrowser.Providers.TV
         /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
         protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo)
         {
-            if (HasLocalMeta(item))
+            // 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;
             }
@@ -181,7 +182,8 @@ namespace MediaBrowser.Providers.TV
         /// <returns>Task{System.Boolean}.</returns>
         public override async Task<bool> FetchAsync(BaseItem item, bool force, CancellationToken cancellationToken)
         {
-            if (HasLocalMeta(item))
+            // 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;
             }
diff --git a/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs b/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs
index acabc3a99..96f0c5178 100644
--- a/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs
@@ -272,8 +272,8 @@ namespace MediaBrowser.Providers.TV
                 await DownloadSeriesZip(seriesId, seriesDataPath, cancellationToken).ConfigureAwait(false);
             }
 
-            // Only examine the main info if there's no local metadata
-            if (!HasLocalMeta(series))
+            // Examine if there's no local metadata, or save local is on (to get updates)
+            if (!HasLocalMeta(series) || ConfigurationManager.Configuration.SaveLocalMeta)
             {
                 var seriesXmlPath = Path.Combine(seriesDataPath, seriesXmlFilename);
                 var actorsXmlPath = Path.Combine(seriesDataPath, "actors.xml");