New: Store Task StartTime, Show Duration in UI

This commit is contained in:
Qstick 2020-02-19 20:27:25 +00:00
commit 16a23b9d79
12 changed files with 57 additions and 8 deletions

View file

@ -53,6 +53,7 @@ namespace Lidarr.Api.V1.System.Tasks
TaskName = taskName,
Interval = scheduledTask.Interval,
LastExecution = scheduledTask.LastExecution,
LastStartTime = scheduledTask.LastStartTime,
NextExecution = scheduledTask.LastExecution.AddMinutes(scheduledTask.Interval)
};
}

View file

@ -9,6 +9,9 @@ namespace Lidarr.Api.V1.System.Tasks
public string TaskName { get; set; }
public int Interval { get; set; }
public DateTime LastExecution { get; set; }
public DateTime LastStartTime { get; set; }
public DateTime NextExecution { get; set; }
public TimeSpan LastDuration => LastExecution - LastStartTime;
}
}

View file

@ -0,0 +1,14 @@
using FluentMigrator;
using NzbDrone.Core.Datastore.Migration.Framework;
namespace NzbDrone.Core.Datastore.Migration
{
[Migration(40)]
public class task_duration : NzbDroneMigrationBase
{
protected override void MainDbUpgrade()
{
Alter.Table("ScheduledTasks").AddColumn("LastStartTime").AsDateTime().Nullable();
}
}
}

View file

@ -8,5 +8,6 @@ namespace NzbDrone.Core.Jobs
public string TypeName { get; set; }
public int Interval { get; set; }
public DateTime LastExecution { get; set; }
public DateTime LastStartTime { get; set; }
}
}

View file

@ -8,7 +8,7 @@ namespace NzbDrone.Core.Jobs
public interface IScheduledTaskRepository : IBasicRepository<ScheduledTask>
{
ScheduledTask GetDefinition(Type type);
void SetLastExecutionTime(int id, DateTime executionTime);
void SetLastExecutionTime(int id, DateTime executionTime, DateTime startTime);
}
public class ScheduledTaskRepository : BasicRepository<ScheduledTask>, IScheduledTaskRepository
@ -23,15 +23,16 @@ namespace NzbDrone.Core.Jobs
return Query.Where(c => c.TypeName == type.FullName).Single();
}
public void SetLastExecutionTime(int id, DateTime executionTime)
public void SetLastExecutionTime(int id, DateTime executionTime, DateTime startTime)
{
var task = new ScheduledTask
{
Id = id,
LastExecution = executionTime
LastExecution = executionTime,
LastStartTime = startTime
};
SetFields(task, scheduledTask => scheduledTask.LastExecution);
SetFields(task, scheduledTask => scheduledTask.LastExecution, scheduledTask => scheduledTask.LastStartTime);
}
}
}

View file

@ -39,7 +39,7 @@ namespace NzbDrone.Core.Jobs
foreach (var task in tasks)
{
_commandQueueManager.Push(task.TypeName, task.LastExecution, CommandPriority.Low, CommandTrigger.Scheduled);
_commandQueueManager.Push(task.TypeName, task.LastExecution, task.LastStartTime, CommandPriority.Low, CommandTrigger.Scheduled);
}
}
finally

View file

@ -145,7 +145,7 @@ namespace NzbDrone.Core.Jobs
if (scheduledTask != null && message.Command.Body.UpdateScheduledTask)
{
_logger.Trace("Updating last run time for: {0}", scheduledTask.TypeName);
_scheduledTaskRepository.SetLastExecutionTime(scheduledTask.Id, DateTime.UtcNow);
_scheduledTaskRepository.SetLastExecutionTime(scheduledTask.Id, DateTime.UtcNow, message.Command.StartedAt.Value);
}
}

View file

@ -28,6 +28,7 @@ namespace NzbDrone.Core.Messaging.Commands
public string Name { get; private set; }
public DateTime? LastExecutionTime { get; set; }
public DateTime? LastStartTime { get; set; }
public CommandTrigger Trigger { get; set; }
public bool SuppressMessages { get; set; }

View file

@ -19,7 +19,7 @@ namespace NzbDrone.Core.Messaging.Commands
where TCommand : Command;
CommandModel Push<TCommand>(TCommand command, CommandPriority priority = CommandPriority.Normal, CommandTrigger trigger = CommandTrigger.Unspecified)
where TCommand : Command;
CommandModel Push(string commandName, DateTime? lastExecutionTime, CommandPriority priority = CommandPriority.Normal, CommandTrigger trigger = CommandTrigger.Unspecified);
CommandModel Push(string commandName, DateTime? lastExecutionTime, DateTime? lastStartTime, CommandPriority priority = CommandPriority.Normal, CommandTrigger trigger = CommandTrigger.Unspecified);
IEnumerable<CommandModel> Queue(CancellationToken cancellationToken);
List<CommandModel> All();
CommandModel Get(int id);
@ -128,10 +128,11 @@ namespace NzbDrone.Core.Messaging.Commands
return commandModel;
}
public CommandModel Push(string commandName, DateTime? lastExecutionTime, CommandPriority priority = CommandPriority.Normal, CommandTrigger trigger = CommandTrigger.Unspecified)
public CommandModel Push(string commandName, DateTime? lastExecutionTime, DateTime? lastStartTime, CommandPriority priority = CommandPriority.Normal, CommandTrigger trigger = CommandTrigger.Unspecified)
{
dynamic command = GetCommand(commandName);
command.LastExecutionTime = lastExecutionTime;
command.LastStartTime = lastStartTime;
command.Trigger = trigger;
return Push(command, priority, trigger);