Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

2 files changed, 211 insertions, 170 deletions

diff --git a/MediaBrowser.ServerApplication/EntryPoints/LibraryChangedNotifier.cs b/MediaBrowser.ServerApplication/EntryPoints/LibraryChangedNotifier.cs
new file mode 100644
index 000000000..62c1e17f9
--- /dev/null
+++ b/MediaBrowser.ServerApplication/EntryPoints/LibraryChangedNotifier.cs
@@ -0,0 +1,210 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Entities;
+using System.Linq;
+using System.Threading;
+
+namespace MediaBrowser.ServerApplication.EntryPoints
+{
+    public class LibraryChangedNotifier : IServerEntryPoint
+    {
+        /// <summary>
+        /// The _library manager
+        /// </summary>
+        private readonly ILibraryManager _libraryManager;
+
+        private readonly ISessionManager _sessionManager;
+        private readonly IServerManager _serverManager;
+   
+        /// <summary>
+        /// The _library changed sync lock
+        /// </summary>
+        private readonly object _libraryChangedSyncLock = new object();
+
+        /// <summary>
+        /// Gets or sets the library update info.
+        /// </summary>
+        /// <value>The library update info.</value>
+        private LibraryUpdateInfo LibraryUpdateInfo { get; set; }
+
+        /// <summary>
+        /// Gets or sets the library update timer.
+        /// </summary>
+        /// <value>The library update timer.</value>
+        private Timer LibraryUpdateTimer { get; set; }
+
+        /// <summary>
+        /// The library update duration
+        /// </summary>
+        private const int LibraryUpdateDuration = 60000;
+
+        public LibraryChangedNotifier(ILibraryManager libraryManager, ISessionManager sessionManager, IServerManager serverManager)
+        {
+            _libraryManager = libraryManager;
+            _sessionManager = sessionManager;
+            _serverManager = serverManager;
+        }
+
+        public void Run()
+        {
+            _libraryManager.ItemAdded += libraryManager_ItemAdded;
+            _libraryManager.ItemUpdated += libraryManager_ItemUpdated;
+            _libraryManager.ItemRemoved += libraryManager_ItemRemoved;
+
+        }
+
+        /// <summary>
+        /// Handles the ItemAdded event of the libraryManager control.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="ItemChangeEventArgs"/> instance containing the event data.</param>
+        void libraryManager_ItemAdded(object sender, ItemChangeEventArgs e)
+        {
+            lock (_libraryChangedSyncLock)
+            {
+                if (LibraryUpdateInfo == null)
+                {
+                    LibraryUpdateInfo = new LibraryUpdateInfo();
+                }
+
+                if (LibraryUpdateTimer == null)
+                {
+                    LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, LibraryUpdateDuration,
+                                                   Timeout.Infinite);
+                }
+                else
+                {
+                    LibraryUpdateTimer.Change(LibraryUpdateDuration, Timeout.Infinite);
+                }
+
+                if (e.Item.Parent != null)
+                {
+                    LibraryUpdateInfo.FoldersAddedTo.Add(e.Item.Parent.Id);
+                }
+
+                LibraryUpdateInfo.ItemsAdded.Add(e.Item.Id);
+            }
+        }
+
+        /// <summary>
+        /// Handles the ItemUpdated event of the libraryManager control.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="ItemChangeEventArgs"/> instance containing the event data.</param>
+        void libraryManager_ItemUpdated(object sender, ItemChangeEventArgs e)
+        {
+            lock (_libraryChangedSyncLock)
+            {
+                if (LibraryUpdateInfo == null)
+                {
+                    LibraryUpdateInfo = new LibraryUpdateInfo();
+                }
+
+                if (LibraryUpdateTimer == null)
+                {
+                    LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, LibraryUpdateDuration,
+                                                   Timeout.Infinite);
+                }
+                else
+                {
+                    LibraryUpdateTimer.Change(LibraryUpdateDuration, Timeout.Infinite);
+                }
+
+                LibraryUpdateInfo.ItemsUpdated.Add(e.Item.Id);
+            }
+        }
+
+        /// <summary>
+        /// Handles the ItemRemoved event of the libraryManager control.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="ItemChangeEventArgs"/> instance containing the event data.</param>
+        void libraryManager_ItemRemoved(object sender, ItemChangeEventArgs e)
+        {
+            lock (_libraryChangedSyncLock)
+            {
+                if (LibraryUpdateInfo == null)
+                {
+                    LibraryUpdateInfo = new LibraryUpdateInfo();
+                }
+
+                if (LibraryUpdateTimer == null)
+                {
+                    LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, LibraryUpdateDuration,
+                                                   Timeout.Infinite);
+                }
+                else
+                {
+                    LibraryUpdateTimer.Change(LibraryUpdateDuration, Timeout.Infinite);
+                }
+
+                if (e.Item.Parent != null)
+                {
+                    LibraryUpdateInfo.FoldersRemovedFrom.Add(e.Item.Parent.Id);
+                }
+
+                LibraryUpdateInfo.ItemsRemoved.Add(e.Item.Id);
+            }
+        }
+
+        /// <summary>
+        /// Libraries the update timer callback.
+        /// </summary>
+        /// <param name="state">The state.</param>
+        private void LibraryUpdateTimerCallback(object state)
+        {
+            lock (_libraryChangedSyncLock)
+            {
+                // Remove dupes in case some were saved multiple times
+                LibraryUpdateInfo.FoldersAddedTo = LibraryUpdateInfo.FoldersAddedTo.Distinct().ToList();
+
+                LibraryUpdateInfo.FoldersRemovedFrom = LibraryUpdateInfo.FoldersRemovedFrom.Distinct().ToList();
+
+                LibraryUpdateInfo.ItemsUpdated = LibraryUpdateInfo.ItemsUpdated
+                    .Where(i => !LibraryUpdateInfo.ItemsAdded.Contains(i))
+                    .Distinct()
+                    .ToList();
+
+                _serverManager.SendWebSocketMessage("LibraryChanged", LibraryUpdateInfo);
+
+                if (LibraryUpdateTimer != null)
+                {
+                    LibraryUpdateTimer.Dispose();
+                    LibraryUpdateTimer = null;
+                }
+
+                LibraryUpdateInfo = null;
+            }
+        }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+        }
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources.
+        /// </summary>
+        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected virtual void Dispose(bool dispose)
+        {
+            if (dispose)
+            {
+                if (LibraryUpdateTimer != null)
+                {
+                    LibraryUpdateTimer.Dispose();
+                    LibraryUpdateTimer = null;
+                }
+
+                _libraryManager.ItemAdded -= libraryManager_ItemAdded;
+                _libraryManager.ItemUpdated -= libraryManager_ItemUpdated;
+                _libraryManager.ItemRemoved -= libraryManager_ItemRemoved;
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs b/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs
index 5e0a477f3..1a29d5029 100644
--- a/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs
+++ b/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs
@@ -8,13 +8,10 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Updates;
-using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Updates;
 using System;
-using System.Linq;
-using System.Threading;
 
 namespace MediaBrowser.ServerApplication.EntryPoints
 {
@@ -38,11 +35,6 @@ namespace MediaBrowser.ServerApplication.EntryPoints
         private readonly IUserManager _userManager;
 
         /// <summary>
-        /// The _library manager
-        /// </summary>
-        private readonly ILibraryManager _libraryManager;
-
-        /// <summary>
         /// The _installation manager
         /// </summary>
         private readonly IInstallationManager _installationManager;
@@ -58,39 +50,16 @@ namespace MediaBrowser.ServerApplication.EntryPoints
         private readonly ITaskManager _taskManager;
 
         /// <summary>
-        /// The _library changed sync lock
-        /// </summary>
-        private readonly object _libraryChangedSyncLock = new object();
-
-        /// <summary>
-        /// Gets or sets the library update info.
-        /// </summary>
-        /// <value>The library update info.</value>
-        private LibraryUpdateInfo LibraryUpdateInfo { get; set; }
-
-        /// <summary>
-        /// Gets or sets the library update timer.
-        /// </summary>
-        /// <value>The library update timer.</value>
-        private Timer LibraryUpdateTimer { get; set; }
-
-        /// <summary>
-        /// The library update duration
-        /// </summary>
-        private const int LibraryUpdateDuration = 60000;
-
-        /// <summary>
         /// Initializes a new instance of the <see cref="WebSocketEvents" /> class.
         /// </summary>
         /// <param name="serverManager">The server manager.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="userManager">The user manager.</param>
-        public WebSocketEvents(IServerManager serverManager, IServerApplicationHost appHost, ILogger logger, IUserManager userManager, ILibraryManager libraryManager, IInstallationManager installationManager, ITaskManager taskManager)
+        public WebSocketEvents(IServerManager serverManager, IServerApplicationHost appHost, ILogger logger, IUserManager userManager, IInstallationManager installationManager, ITaskManager taskManager)
         {
             _serverManager = serverManager;
             _logger = logger;
             _userManager = userManager;
-            _libraryManager = libraryManager;
             _installationManager = installationManager;
             _appHost = appHost;
             _taskManager = taskManager;
@@ -103,10 +72,6 @@ namespace MediaBrowser.ServerApplication.EntryPoints
 
             _appHost.HasPendingRestartChanged += kernel_HasPendingRestartChanged;
 
-            _libraryManager.ItemAdded += libraryManager_ItemAdded;
-            _libraryManager.ItemUpdated += libraryManager_ItemUpdated;
-            _libraryManager.ItemRemoved += libraryManager_ItemRemoved;
-
             _installationManager.PluginUninstalled += InstallationManager_PluginUninstalled;
             _installationManager.PackageInstalling += installationManager_PackageInstalling;
             _installationManager.PackageInstallationCancelled += installationManager_PackageInstallationCancelled;
@@ -169,130 +134,6 @@ namespace MediaBrowser.ServerApplication.EntryPoints
         }
 
         /// <summary>
-        /// Handles the ItemAdded event of the libraryManager control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="ItemChangeEventArgs"/> instance containing the event data.</param>
-        void libraryManager_ItemAdded(object sender, ItemChangeEventArgs e)
-        {
-            lock (_libraryChangedSyncLock)
-            {
-                if (LibraryUpdateInfo == null)
-                {
-                    LibraryUpdateInfo = new LibraryUpdateInfo();
-                }
-
-                if (LibraryUpdateTimer == null)
-                {
-                    LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, LibraryUpdateDuration,
-                                                   Timeout.Infinite);
-                }
-                else
-                {
-                    LibraryUpdateTimer.Change(LibraryUpdateDuration, Timeout.Infinite);
-                }
-
-                if (e.Item.Parent != null)
-                {
-                    LibraryUpdateInfo.FoldersAddedTo.Add(e.Item.Parent.Id);
-                }
-
-                LibraryUpdateInfo.ItemsAdded.Add(e.Item.Id);
-            }
-        }
-
-        /// <summary>
-        /// Handles the ItemUpdated event of the libraryManager control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="ItemChangeEventArgs"/> instance containing the event data.</param>
-        void libraryManager_ItemUpdated(object sender, ItemChangeEventArgs e)
-        {
-            lock (_libraryChangedSyncLock)
-            {
-                if (LibraryUpdateInfo == null)
-                {
-                    LibraryUpdateInfo = new LibraryUpdateInfo();
-                }
-
-                if (LibraryUpdateTimer == null)
-                {
-                    LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, LibraryUpdateDuration,
-                                                   Timeout.Infinite);
-                }
-                else
-                {
-                    LibraryUpdateTimer.Change(LibraryUpdateDuration, Timeout.Infinite);
-                }
-
-                LibraryUpdateInfo.ItemsUpdated.Add(e.Item.Id);
-            }
-        }
-
-        /// <summary>
-        /// Handles the ItemRemoved event of the libraryManager control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="ItemChangeEventArgs"/> instance containing the event data.</param>
-        void libraryManager_ItemRemoved(object sender, ItemChangeEventArgs e)
-        {
-            lock (_libraryChangedSyncLock)
-            {
-                if (LibraryUpdateInfo == null)
-                {
-                    LibraryUpdateInfo = new LibraryUpdateInfo();
-                }
-
-                if (LibraryUpdateTimer == null)
-                {
-                    LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, LibraryUpdateDuration,
-                                                   Timeout.Infinite);
-                }
-                else
-                {
-                    LibraryUpdateTimer.Change(LibraryUpdateDuration, Timeout.Infinite);
-                }
-
-                if (e.Item.Parent != null)
-                {
-                    LibraryUpdateInfo.FoldersRemovedFrom.Add(e.Item.Parent.Id);
-                }
-
-                LibraryUpdateInfo.ItemsRemoved.Add(e.Item.Id);
-            }
-        }
-
-        /// <summary>
-        /// Libraries the update timer callback.
-        /// </summary>
-        /// <param name="state">The state.</param>
-        private void LibraryUpdateTimerCallback(object state)
-        {
-            lock (_libraryChangedSyncLock)
-            {
-                // Remove dupes in case some were saved multiple times
-                LibraryUpdateInfo.FoldersAddedTo = LibraryUpdateInfo.FoldersAddedTo.Distinct().ToList();
-
-                LibraryUpdateInfo.FoldersRemovedFrom = LibraryUpdateInfo.FoldersRemovedFrom.Distinct().ToList();
-
-                LibraryUpdateInfo.ItemsUpdated = LibraryUpdateInfo.ItemsUpdated
-                    .Where(i => !LibraryUpdateInfo.ItemsAdded.Contains(i))
-                    .Distinct()
-                    .ToList();
-
-                _serverManager.SendWebSocketMessage("LibraryChanged", LibraryUpdateInfo);
-
-                if (LibraryUpdateTimer != null)
-                {
-                    LibraryUpdateTimer.Dispose();
-                    LibraryUpdateTimer = null;
-                }
-
-                LibraryUpdateInfo = null;
-            }
-        }
-
-        /// <summary>
         /// Installations the manager_ plugin uninstalled.
         /// </summary>
         /// <param name="sender">The sender.</param>
@@ -350,16 +191,6 @@ namespace MediaBrowser.ServerApplication.EntryPoints
         {
             if (dispose)
             {
-                if (LibraryUpdateTimer != null)
-                {
-                    LibraryUpdateTimer.Dispose();
-                    LibraryUpdateTimer = null;
-                }
-
-                _libraryManager.ItemAdded -= libraryManager_ItemAdded;
-                _libraryManager.ItemUpdated -= libraryManager_ItemUpdated;
-                _libraryManager.ItemRemoved -= libraryManager_ItemRemoved;
-                
                 _userManager.UserDeleted -= userManager_UserDeleted;
                 _userManager.UserUpdated -= userManager_UserUpdated;