Fixed: Prevent two TypeExclusive commands running at once

The check was bypassed if a disk access command was running at the
same time.

src/NzbDrone.Core.Test/Messaging/Commands/CommandQueueFixture.cs

@@ -88,6 +88,25 @@ namespace NzbDrone.Core.Test.Messaging.Commands
             command.Should().BeNull();
         }
 
+        [Test]
+        public void should_not_return_type_exclusive_command_if_another_and_disk_access_command_running()
+        {
+            GivenStartedTypeExclusiveCommand();
+            GivenStartedDiskCommand();
+
+            var newCommandModel = Builder<CommandModel>
+                .CreateNew()
+                .With(c => c.Name = "ImportListSync")
+                .With(c => c.Body = new ImportListSyncCommand())
+                .Build();
+
+            Subject.Add(newCommandModel);
+
+            Subject.TryGet(out var command);
+
+            command.Should().BeNull();
+        }
+
         [Test]
         public void should_return_type_exclusive_command_if_another_not_running()
         {

src/NzbDrone.Core/Messaging/Commands/CommandQueue.cs

@@ -134,25 +134,19 @@ namespace NzbDrone.Core.Messaging.Commands
                         .Select(x => x.Body.Name)
                         .ToList();
 
-                    var localItem = _items.Where(c =>
+                    var queuedCommands = _items.Where(c => c.Status == CommandStatus.Queued);
-                        {
+
-                            // If an executing command requires disk access don't return a command that
-                            // requires disk access. A lower priority or later queued task could be returned
-                            // instead, but that will allow other tasks to execute whiule waiting for disk access.
                     if (startedCommands.Any(x => x.Body.RequiresDiskAccess))
                     {
-                                return c.Status == CommandStatus.Queued &&
+                        queuedCommands = queuedCommands.Where(c => !c.Body.RequiresDiskAccess);
-                                       !c.Body.RequiresDiskAccess;
                     }
 
-                            // If an executing command is TypeExclusive don't return a command with same type
+                    if (startedCommands.Any(x => x.Body.IsTypeExclusive))
-                            if (startedCommands.Any(x => x.Body.IsTypeExclusive)) {
+                    {
-                                return c.Status == CommandStatus.Queued && !exclusiveTypes.Any(x => x == c.Body.Name);
+                        queuedCommands = queuedCommands.Where(c => !exclusiveTypes.Any(x => x == c.Body.Name));
                     }
 
-                            return c.Status == CommandStatus.Queued;
+                    var localItem = queuedCommands.OrderByDescending(c => c.Priority)
-                        })
-                                              .OrderByDescending(c => c.Priority)
                         .ThenBy(c => c.QueuedAt)
                         .FirstOrDefault();