1 files changed, 31 insertions, 22 deletions

diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
index 0d3f5dfcd..0d61c2ce1 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Tasks;
 using System.Collections.Generic;
@@ -11,7 +12,7 @@ namespace MediaBrowser.Api.ScheduledTasks
     /// <summary>
     /// Class ScheduledTasksWebSocketListener
     /// </summary>
-    public class ScheduledTasksWebSocketListener : BasePeriodicWebSocketListener<IEnumerable<TaskInfo>, object>
+    public class ScheduledTasksWebSocketListener : BasePeriodicWebSocketListener<IEnumerable<TaskInfo>, WebSocketListenerState>
     {
         /// <summary>
         /// Gets or sets the task manager.
@@ -37,39 +38,47 @@ namespace MediaBrowser.Api.ScheduledTasks
             : base(logger)
         {
             TaskManager = taskManager;
+
+            TaskManager.TaskExecuting += TaskManager_TaskExecuting;
+            TaskManager.TaskCompleted += TaskManager_TaskCompleted;
+        }
+
+        void TaskManager_TaskCompleted(object sender, TaskCompletionEventArgs e)
+        {
+            SendData(true);
+            e.Task.TaskProgress -= Argument_TaskProgress;
         }
 
-        private bool _lastResponseHadTasksRunning = true;
+        void TaskManager_TaskExecuting(object sender, GenericEventArgs<IScheduledTaskWorker> e)
+        {
+            SendData(true);
+            e.Argument.TaskProgress += Argument_TaskProgress;
+        }
+
+        void Argument_TaskProgress(object sender, GenericEventArgs<double> e)
+        {
+            SendData(false);
+        }
 
         /// <summary>
         /// Gets the data to send.
         /// </summary>
         /// <param name="state">The state.</param>
         /// <returns>Task{IEnumerable{TaskInfo}}.</returns>
-        protected override Task<IEnumerable<TaskInfo>> GetDataToSend(object state)
+        protected override Task<IEnumerable<TaskInfo>> GetDataToSend(WebSocketListenerState state)
         {
-            var tasks = TaskManager.ScheduledTasks.ToList();
-
-            var anyRunning = tasks.Any(i => i.State != TaskState.Idle);
-
-            if (anyRunning)
-            {
-                _lastResponseHadTasksRunning = true;
-            }
-            else
-            {
-                if (!_lastResponseHadTasksRunning)
-                {
-                    return Task.FromResult<IEnumerable<TaskInfo>>(null);
-                }
-
-                _lastResponseHadTasksRunning = false;
-            }
-
-            return Task.FromResult(tasks
+            return Task.FromResult(TaskManager.ScheduledTasks
                 .OrderBy(i => i.Name)
                 .Select(ScheduledTaskHelpers.GetTaskInfo)
                 .Where(i => !i.IsHidden));
         }
+
+        protected override bool SendOnTimer
+        {
+            get
+            {
+                return false;
+            }
+        }
     }
 }