New: Cancel tasks in command queue

2026-04-20 21:54:25 -04:00 · 2018-09-01 23:11:19 -04:00
parent 61387b3d44
commit 9d2fbddc7d
5 changed files with 33 additions and 3 deletions
@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Threading;
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Common.EnsureThat;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Lifecycle;
+using NzbDrone.Core.Exceptions;
 using NzbDrone.Core.Messaging.Events;

 namespace NzbDrone.Core.Messaging.Commands
@@ -25,6 +27,7 @@ namespace NzbDrone.Core.Messaging.Commands
        void Complete(CommandModel command, string message);
        void Fail(CommandModel command, string message, Exception e);
        void Requeue();
+        void Cancel(int id);
        void CleanCommands();
    }

@@ -193,6 +196,14 @@ namespace NzbDrone.Core.Messaging.Commands
            }
        }

+        public void Cancel(int id)
+        {
+            if (!_commandQueue.RemoveIfQueued(id))
+            {
+                throw new NzbDroneClientException(HttpStatusCode.Conflict, "Unable to cancel task");
+            }
+        }
+
        public void CleanCommands()
        {
            _logger.Trace("Cleaning up old commands");