self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-16 11:37:58 +02:00
Code Issues Releases Activity

Partial updates for command updates

Browse Source
This commit is contained in:
Mark McDowall 2015-05-01 22:03:20 -07:00
parent 97cbdfdc5c
commit 6ab629ea98
4 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/NzbDrone.Core/Messaging/Commands/CommandQueueManager.cs
View File

@ -102,7 +102,7 @@ public IEnumerable<CommandModel> Queue(CancellationToken cancellationToken)
public CommandModel Get(int id)
{
return _commandCache.Get(id.ToString(), () => FindMessage(_repo.Get(id)));
return _commandCache.Get(id.ToString(), () => FindCommand(_repo.Get(id)));
}
public List<CommandModel> GetStarted()
@ -124,7 +124,7 @@ public void Start(CommandModel command)
_logger.Trace("Marking command as started: {0}", command.Name);
_commandCache.Set(command.Id.ToString(), command);
_repo.Update(command);
_repo.Start(command);
}
public void Complete(CommandModel command, string message)
@ -170,7 +170,7 @@ private dynamic GetCommand(string commandName)
return Json.Deserialize("{}", commandType);
}
private CommandModel FindMessage(CommandModel command)
private CommandModel FindCommand(CommandModel command)
{
var cachedCommand = _commandCache.Find(command.Id.ToString());
@ -192,7 +192,7 @@ private void Update(CommandModel command, CommandStatus status, string message)
_logger.Trace("Updating command status");
_commandCache.Set(command.Id.ToString(), command);
_repo.Update(command);
_repo.End(command);
}
private List<CommandModel> QueuedOrStarted(string name)
@ -206,6 +206,7 @@ public void Handle(ApplicationStartedEvent message)
{
_logger.Trace("Orphaning incomplete commands");
_repo.OrphanStarted();
Requeue();
}
}
}

12
src/NzbDrone.Core/Messaging/Commands/CommandRepository.cs
View File

@ -14,6 +14,8 @@ public interface ICommandRepository : IBasicRepository<CommandModel>
List<CommandModel> FindQueuedOrStarted(string name);
List<CommandModel> Queued();
List<CommandModel> Started();
void Start(CommandModel command);
void End(CommandModel command);
}
public class CommandRepository : BasicRepository<CommandModel>, ICommandRepository
@ -67,5 +69,15 @@ public List<CommandModel> Started()
{
return Query.Where(c => c.Status == CommandStatus.Started);
}
public void Start(CommandModel command)
{
SetFields(command, c => c.StartedAt, c => c.Status);
}
public void End(CommandModel command)
{
SetFields(command, c => c.EndedAt, c => c.Status, c => c.Duration);
}
}
}

20
src/NzbDrone.Core/Messaging/Commands/RequeueQueuedCommands.cs
View File

@ -1,20 +0,0 @@
using NzbDrone.Core.Lifecycle;
using NzbDrone.Core.Messaging.Events;
namespace NzbDrone.Core.Messaging.Commands
{
public class RequeueQueuedCommands : IHandle<ApplicationStartedEvent>
{
private readonly IManageCommandQueue _commandQueueManager;
public RequeueQueuedCommands(IManageCommandQueue commandQueueManager)
{
_commandQueueManager = commandQueueManager;
}
public void Handle(ApplicationStartedEvent message)
{
_commandQueueManager.Requeue();
}
}
}

1
src/NzbDrone.Core/NzbDrone.Core.csproj
View File

@ -621,7 +621,6 @@
<Compile Include="Messaging\Commands\CommandQueueManager.cs" />
<Compile Include="Messaging\Commands\CommandTrigger.cs" />
<Compile Include="Messaging\Commands\IExecute.cs" />
<Compile Include="Messaging\Commands\RequeueQueuedCommands.cs" />
<Compile Include="Messaging\Commands\TestCommand.cs" />
<Compile Include="Messaging\Commands\TestCommandExecutor.cs" />
<Compile Include="Messaging\Events\CommandExecutedEvent.cs" />