From 1b18baca444be14958b993ae57f12a740f0ba7c0 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 10 Sep 2014 23:49:25 -0700 Subject: [PATCH] Fixed: Manual refresh of all series will refresh every series, including ended series --- src/NzbDrone.Api/Commands/CommandModule.cs | 6 +++++- src/NzbDrone.Core/Messaging/Commands/Command.cs | 8 +++++--- src/NzbDrone.Core/Tv/RefreshSeriesService.cs | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/NzbDrone.Api/Commands/CommandModule.cs b/src/NzbDrone.Api/Commands/CommandModule.cs index 4afcf2c80..c79c16530 100644 --- a/src/NzbDrone.Api/Commands/CommandModule.cs +++ b/src/NzbDrone.Api/Commands/CommandModule.cs @@ -21,7 +21,10 @@ namespace NzbDrone.Api.Commands private readonly IContainer _container; private readonly ITrackCommands _trackCommands; - public CommandModule(ICommandExecutor commandExecutor,IBroadcastSignalRMessage signalRBroadcaster, IContainer container, ITrackCommands trackCommands) + public CommandModule(ICommandExecutor commandExecutor, + IBroadcastSignalRMessage signalRBroadcaster, + IContainer container, + ITrackCommands trackCommands) : base(signalRBroadcaster) { _commandExecutor = commandExecutor; @@ -48,6 +51,7 @@ namespace NzbDrone.Api.Commands .Equals(commandResource.Name, StringComparison.InvariantCultureIgnoreCase)); dynamic command = Request.Body.FromJson(commandType); + command.Manual = true; var trackedCommand = (Command)_commandExecutor.PublishCommandAsync(command); return trackedCommand.Id; diff --git a/src/NzbDrone.Core/Messaging/Commands/Command.cs b/src/NzbDrone.Core/Messaging/Commands/Command.cs index 9c8b64b30..699770242 100644 --- a/src/NzbDrone.Core/Messaging/Commands/Command.cs +++ b/src/NzbDrone.Core/Messaging/Commands/Command.cs @@ -15,7 +15,7 @@ namespace NzbDrone.Core.Messaging.Commands public CommandStatus State { get; private set; } public DateTime StateChangeTime { get; private set; } - public virtual bool SendUpdatesToClient + public virtual Boolean SendUpdatesToClient { get { @@ -31,10 +31,11 @@ namespace NzbDrone.Core.Messaging.Commands } } + public Boolean Manual { get; set; } public Exception Exception { get; private set; } - public string Message { get; private set; } + public String Message { get; private set; } - public string Name { get; private set; } + public String Name { get; private set; } public DateTime? LastExecutionTime { get; set; } protected Command() @@ -43,6 +44,7 @@ namespace NzbDrone.Core.Messaging.Commands StateChangeTime = DateTime.UtcNow; State = CommandStatus.Pending; _stopWatch = new StopWatch(); + Manual = false; lock (Mutex) { diff --git a/src/NzbDrone.Core/Tv/RefreshSeriesService.cs b/src/NzbDrone.Core/Tv/RefreshSeriesService.cs index 8ee9fff76..f2fdebaf3 100644 --- a/src/NzbDrone.Core/Tv/RefreshSeriesService.cs +++ b/src/NzbDrone.Core/Tv/RefreshSeriesService.cs @@ -138,7 +138,7 @@ namespace NzbDrone.Core.Tv foreach (var series in allSeries) { - if (_checkIfSeriesShouldBeRefreshed.ShouldRefresh(series)) + if (message.Manual || _checkIfSeriesShouldBeRefreshed.ShouldRefresh(series)) { try {