Backup_Repos/Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr synced 2026-05-08 04:30:26 +02:00
Code Issues Projects Releases Wiki Activity

Inherit trigger from pushed command models

Browse source 
(cherry picked from commit 0bc4903954b955fce0c368ef7fd2a6f3761d6a93)
This commit is contained in:
Bogdan 2024-10-17 04:46:15 +03:00
parent fd2a14e01b
commit 257d38de66
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/NzbDrone.Core/Messaging/Commands/CommandQueueManager.cs
View file

@ -105,6 +105,8 @@ public CommandModel Push<TCommand>(TCommand command, CommandPriority priority =
_logger.Trace("Publishing {0}", command.Name);
_logger.Trace("Checking if command is queued or started: {0}", command.Name);
command.Trigger = trigger;
lock (_commandQueue)
{
var existingCommands = QueuedOrStarted(command.Name);
@ -141,7 +143,6 @@ public CommandModel Push(string commandName, DateTime? lastExecutionTime, DateTi
var command = GetCommand(commandName);
command.LastExecutionTime = lastExecutionTime;
command.LastStartTime = lastStartTime;
command.Trigger = trigger;
return Push(command, priority, trigger);
}
@ -232,13 +233,13 @@ public void CleanCommands()
_repo.Trim();
}
private dynamic GetCommand(string commandName)
private Command GetCommand(string commandName)
{
commandName = commandName.Split('.').Last();
var commands = _knownTypes.GetImplementations(typeof(Command));
var commandType = commands.Single(c => c.Name.Equals(commandName, StringComparison.InvariantCultureIgnoreCase));
return Json.Deserialize("{}", commandType);
return Json.Deserialize("{}", commandType) as Command;
}
private void Update(CommandModel command, CommandStatus status, string message)

3
src/Prowlarr.Api.V1/Commands/CommandController.cs
View file

@ -61,9 +61,8 @@ public ActionResult<CommandResource> StartCommand([FromBody] CommandResource com
using var reader = new StreamReader(Request.Body);
var body = reader.ReadToEnd();
dynamic command = STJson.Deserialize(body, commandType);
var command = STJson.Deserialize(body, commandType) as Command;
command.Trigger = CommandTrigger.Manual;
command.SuppressMessages = !command.SendUpdatesToClient;
command.SendUpdatesToClient = true;
command.ClientUserAgent = Request.Headers["User-Agent"];