From 7a67dba8efbd2d586b0576f18f128f76ff92efab Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 17 Sep 2016 02:08:38 -0400
Subject: add disposed check to FileRefresher

---
 MediaBrowser.Server.Implementations/IO/FileRefresher.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'MediaBrowser.Server.Implementations/IO/FileRefresher.cs')

diff --git a/MediaBrowser.Server.Implementations/IO/FileRefresher.cs b/MediaBrowser.Server.Implementations/IO/FileRefresher.cs
index 2f4605c5c..8e28aa2a0 100644
--- a/MediaBrowser.Server.Implementations/IO/FileRefresher.cs
+++ b/MediaBrowser.Server.Implementations/IO/FileRefresher.cs
@@ -68,6 +68,11 @@ namespace MediaBrowser.Server.Implementations.IO
 
             lock (_timerLock)
             {
+                if (_disposed)
+                {
+                    return;
+                }
+
                 if (_timer == null)
                 {
                     _timer = new Timer(OnTimerCallback, null, TimeSpan.FromSeconds(ConfigurationManager.Configuration.LibraryMonitorDelay), TimeSpan.FromMilliseconds(-1));
@@ -287,6 +292,7 @@ namespace MediaBrowser.Server.Implementations.IO
                 if (_timer != null)
                 {
                     _timer.Dispose();
+                    _timer = null;
                 }
             }
         }
-- 
cgit v1.2.3


From 61ee765de96eeffa28b0042d633166ba5d214850 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 20 Sep 2016 15:43:27 -0400
Subject: update library monitor

---
 MediaBrowser.Server.Implementations/IO/FileRefresher.cs  |  4 +++-
 MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/IO/FileRefresher.cs')

diff --git a/MediaBrowser.Server.Implementations/IO/FileRefresher.cs b/MediaBrowser.Server.Implementations/IO/FileRefresher.cs
index 8e28aa2a0..3df7a03d4 100644
--- a/MediaBrowser.Server.Implementations/IO/FileRefresher.cs
+++ b/MediaBrowser.Server.Implementations/IO/FileRefresher.cs
@@ -12,6 +12,7 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Server.Implementations.ScheduledTasks;
+using MoreLinq;
 
 namespace MediaBrowser.Server.Implementations.IO
 {
@@ -136,9 +137,10 @@ namespace MediaBrowser.Server.Implementations.IO
         private async Task ProcessPathChanges(List<string> paths)
         {
             var itemsToRefresh = paths
+                .Distinct(StringComparer.OrdinalIgnoreCase)
                 .Select(GetAffectedBaseItem)
                 .Where(item => item != null)
-                .Distinct()
+                .DistinctBy(i => i.Id)
                 .ToList();
 
             foreach (var p in paths)
diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
index 8bb40a00e..6e0f9a3c4 100644
--- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
+++ b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
@@ -404,7 +404,20 @@ namespace MediaBrowser.Server.Implementations.IO
             {
                 Logger.Debug("Changed detected of type " + e.ChangeType + " to " + e.FullPath);
 
-                ReportFileSystemChanged(e.FullPath);
+                var path = e.FullPath;
+
+                // For deletes, use the parent path
+                if (e.ChangeType == WatcherChangeTypes.Deleted)
+                {
+                    var parentPath = Path.GetDirectoryName(path);
+
+                    if (!string.IsNullOrWhiteSpace(parentPath))
+                    {
+                        path = parentPath;
+                    }
+                }
+
+                ReportFileSystemChanged(path);
             }
             catch (Exception ex)
             {
-- 
cgit v1.2.3