diff options
Diffstat (limited to 'MediaBrowser.Controller/IO/DirectoryWatchers.cs')
| -rw-r--r-- | MediaBrowser.Controller/IO/DirectoryWatchers.cs | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/MediaBrowser.Controller/IO/DirectoryWatchers.cs b/MediaBrowser.Controller/IO/DirectoryWatchers.cs index 2e3340089..eb1358e16 100644 --- a/MediaBrowser.Controller/IO/DirectoryWatchers.cs +++ b/MediaBrowser.Controller/IO/DirectoryWatchers.cs @@ -62,11 +62,9 @@ namespace MediaBrowser.Controller.IO Logger.LogDebugInfo("****** Watcher sees change of type " + e.ChangeType.ToString() + " to " + e.FullPath);
lock (affectedPaths)
{
- if (!affectedPaths.Contains(e.FullPath))
- {
- Logger.LogDebugInfo("****** Adding " + e.FullPath + " to affected paths.");
- affectedPaths.Add(e.FullPath);
- }
+ //Since we're watching created, deleted and renamed we always want the parent of the item to be the affected path
+ var affectedPath = Path.GetDirectoryName(e.FullPath);
+
if (e.ChangeType == WatcherChangeTypes.Renamed)
{
var renamedArgs = e as RenamedEventArgs;
@@ -76,6 +74,15 @@ namespace MediaBrowser.Controller.IO affectedPaths.Remove(renamedArgs.OldFullPath);
}
}
+
+ //If anything underneath this path was already marked as affected - remove it as it will now get captured by this one
+ affectedPaths.RemoveAll(p => p.StartsWith(e.FullPath, StringComparison.OrdinalIgnoreCase));
+
+ if (!affectedPaths.ContainsParentFolder(affectedPath))
+ {
+ Logger.LogDebugInfo("****** Adding " + affectedPath + " to affected paths.");
+ affectedPaths.Add(affectedPath);
+ }
}
if (updateTimer == null)
@@ -125,7 +132,7 @@ namespace MediaBrowser.Controller.IO }
foreach (var p in paths) Logger.LogDebugInfo("********* "+ p + " reports change.");
- foreach (var i in itemsToRefresh) Logger.LogDebugInfo("********* "+i.Name + " will be refreshed.");
+ foreach (var i in itemsToRefresh) Logger.LogDebugInfo("********* "+i.Name + " ("+ i.Path + ") will be refreshed.");
return Task.WhenAll(itemsToRefresh.Select(i => i.ChangedExternally()));
}
|