mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-11 20:12:41 +02:00
New: Store Task StartTime, Show Duration in UI
This commit is contained in:
parent
edcc0ba7ce
commit
da50b49e01
@ -5,6 +5,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.lastExecution,
|
.lastExecution,
|
||||||
|
.lastDuration,
|
||||||
.nextExecution {
|
.nextExecution {
|
||||||
composes: cell from '~Components/Table/Cells/TableRowCell.css';
|
composes: cell from '~Components/Table/Cells/TableRowCell.css';
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
|
|||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
import formatDate from 'Utilities/Date/formatDate';
|
import formatDate from 'Utilities/Date/formatDate';
|
||||||
import formatDateTime from 'Utilities/Date/formatDateTime';
|
import formatDateTime from 'Utilities/Date/formatDateTime';
|
||||||
|
import formatTimeSpan from 'Utilities/Date/formatTimeSpan';
|
||||||
import { icons } from 'Helpers/Props';
|
import { icons } from 'Helpers/Props';
|
||||||
import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
|
import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
|
||||||
import TableRow from 'Components/Table/TableRow';
|
import TableRow from 'Components/Table/TableRow';
|
||||||
@ -91,6 +92,8 @@ class ScheduledTaskRow extends Component {
|
|||||||
name,
|
name,
|
||||||
interval,
|
interval,
|
||||||
lastExecution,
|
lastExecution,
|
||||||
|
lastStartTime,
|
||||||
|
lastDuration,
|
||||||
nextExecution,
|
nextExecution,
|
||||||
isQueued,
|
isQueued,
|
||||||
isExecuting,
|
isExecuting,
|
||||||
@ -108,6 +111,7 @@ class ScheduledTaskRow extends Component {
|
|||||||
const executeNow = !isDisabled && moment().isAfter(nextExecution);
|
const executeNow = !isDisabled && moment().isAfter(nextExecution);
|
||||||
const hasNextExecutionTime = !isDisabled && !executeNow;
|
const hasNextExecutionTime = !isDisabled && !executeNow;
|
||||||
const duration = moment.duration(interval, 'minutes').humanize().replace(/an?(?=\s)/, '1');
|
const duration = moment.duration(interval, 'minutes').humanize().replace(/an?(?=\s)/, '1');
|
||||||
|
const hasLastStartTime = moment(lastStartTime).isAfter('2010-01-01');
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TableRow>
|
<TableRow>
|
||||||
@ -125,6 +129,21 @@ class ScheduledTaskRow extends Component {
|
|||||||
{lastExecutionTime}
|
{lastExecutionTime}
|
||||||
</TableRowCell>
|
</TableRowCell>
|
||||||
|
|
||||||
|
{
|
||||||
|
!hasLastStartTime &&
|
||||||
|
<TableRowCell className={styles.lastDuration}>-</TableRowCell>
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
hasLastStartTime &&
|
||||||
|
<TableRowCell
|
||||||
|
className={styles.lastDuration}
|
||||||
|
title={lastDuration}
|
||||||
|
>
|
||||||
|
{formatTimeSpan(lastDuration)}
|
||||||
|
</TableRowCell>
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
isDisabled &&
|
isDisabled &&
|
||||||
<TableRowCell className={styles.nextExecution}>-</TableRowCell>
|
<TableRowCell className={styles.nextExecution}>-</TableRowCell>
|
||||||
@ -169,6 +188,8 @@ ScheduledTaskRow.propTypes = {
|
|||||||
name: PropTypes.string.isRequired,
|
name: PropTypes.string.isRequired,
|
||||||
interval: PropTypes.number.isRequired,
|
interval: PropTypes.number.isRequired,
|
||||||
lastExecution: PropTypes.string.isRequired,
|
lastExecution: PropTypes.string.isRequired,
|
||||||
|
lastStartTime: PropTypes.string.isRequired,
|
||||||
|
lastDuration: PropTypes.string.isRequired,
|
||||||
nextExecution: PropTypes.string.isRequired,
|
nextExecution: PropTypes.string.isRequired,
|
||||||
isQueued: PropTypes.bool.isRequired,
|
isQueued: PropTypes.bool.isRequired,
|
||||||
isExecuting: PropTypes.bool.isRequired,
|
isExecuting: PropTypes.bool.isRequired,
|
||||||
|
@ -22,6 +22,11 @@ const columns = [
|
|||||||
label: 'Last Execution',
|
label: 'Last Execution',
|
||||||
isVisible: true
|
isVisible: true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'lastDuration',
|
||||||
|
label: 'Last Duration',
|
||||||
|
isVisible: true
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: 'nextExecution',
|
name: 'nextExecution',
|
||||||
label: 'Next Execution',
|
label: 'Next Execution',
|
||||||
|
14
src/NzbDrone.Core/Datastore/Migration/163_task_duration.cs
Normal file
14
src/NzbDrone.Core/Datastore/Migration/163_task_duration.cs
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
using FluentMigrator;
|
||||||
|
using NzbDrone.Core.Datastore.Migration.Framework;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Datastore.Migration
|
||||||
|
{
|
||||||
|
[Migration(163)]
|
||||||
|
public class task_duration : NzbDroneMigrationBase
|
||||||
|
{
|
||||||
|
protected override void MainDbUpgrade()
|
||||||
|
{
|
||||||
|
Alter.Table("ScheduledTasks").AddColumn("LastStartTime").AsDateTime().Nullable();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -8,5 +8,6 @@ public class ScheduledTask : ModelBase
|
|||||||
public string TypeName { get; set; }
|
public string TypeName { get; set; }
|
||||||
public int Interval { get; set; }
|
public int Interval { get; set; }
|
||||||
public DateTime LastExecution { get; set; }
|
public DateTime LastExecution { get; set; }
|
||||||
|
public DateTime LastStartTime { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -9,7 +9,7 @@ namespace NzbDrone.Core.Jobs
|
|||||||
public interface IScheduledTaskRepository : IBasicRepository<ScheduledTask>
|
public interface IScheduledTaskRepository : IBasicRepository<ScheduledTask>
|
||||||
{
|
{
|
||||||
ScheduledTask GetDefinition(Type type);
|
ScheduledTask GetDefinition(Type type);
|
||||||
void SetLastExecutionTime(int id, DateTime executionTime);
|
void SetLastExecutionTime(int id, DateTime executionTime, DateTime startTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ScheduledTaskRepository : BasicRepository<ScheduledTask>, IScheduledTaskRepository
|
public class ScheduledTaskRepository : BasicRepository<ScheduledTask>, IScheduledTaskRepository
|
||||||
@ -25,15 +25,16 @@ public ScheduledTask GetDefinition(Type type)
|
|||||||
return Query(x => x.TypeName == type.FullName).Single();
|
return Query(x => x.TypeName == type.FullName).Single();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetLastExecutionTime(int id, DateTime executionTime)
|
public void SetLastExecutionTime(int id, DateTime executionTime, DateTime startTime)
|
||||||
{
|
{
|
||||||
var task = new ScheduledTask
|
var task = new ScheduledTask
|
||||||
{
|
{
|
||||||
Id = id,
|
Id = id,
|
||||||
LastExecution = executionTime
|
LastExecution = executionTime,
|
||||||
|
LastStartTime = startTime
|
||||||
};
|
};
|
||||||
|
|
||||||
SetFields(task, scheduledTask => scheduledTask.LastExecution);
|
SetFields(task, scheduledTask => scheduledTask.LastExecution, scheduledTask => scheduledTask.LastStartTime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@ private void ExecuteCommands()
|
|||||||
|
|
||||||
foreach (var task in tasks)
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -181,7 +181,7 @@ public void Handle(CommandExecutedEvent message)
|
|||||||
if (scheduledTask != null && message.Command.Body.UpdateScheduledTask)
|
if (scheduledTask != null && message.Command.Body.UpdateScheduledTask)
|
||||||
{
|
{
|
||||||
_logger.Trace("Updating last run time for: {0}", scheduledTask.TypeName);
|
_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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,6 +26,7 @@ public virtual bool SendUpdatesToClient
|
|||||||
|
|
||||||
public string Name { get; private set; }
|
public string Name { get; private set; }
|
||||||
public DateTime? LastExecutionTime { get; set; }
|
public DateTime? LastExecutionTime { get; set; }
|
||||||
|
public DateTime? LastStartTime { get; set; }
|
||||||
public CommandTrigger Trigger { get; set; }
|
public CommandTrigger Trigger { get; set; }
|
||||||
public bool SuppressMessages { get; set; }
|
public bool SuppressMessages { get; set; }
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ public interface IManageCommandQueue
|
|||||||
{
|
{
|
||||||
List<CommandModel> PushMany<TCommand>(List<TCommand> commands) where TCommand : Command;
|
List<CommandModel> PushMany<TCommand>(List<TCommand> commands) where TCommand : Command;
|
||||||
CommandModel Push<TCommand>(TCommand command, CommandPriority priority = CommandPriority.Normal, CommandTrigger trigger = CommandTrigger.Unspecified) 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);
|
IEnumerable<CommandModel> Queue(CancellationToken cancellationToken);
|
||||||
List<CommandModel> All();
|
List<CommandModel> All();
|
||||||
CommandModel Get(int id);
|
CommandModel Get(int id);
|
||||||
@ -124,10 +124,11 @@ public CommandModel Push<TCommand>(TCommand command, CommandPriority priority =
|
|||||||
return commandModel;
|
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);
|
dynamic command = GetCommand(commandName);
|
||||||
command.LastExecutionTime = lastExecutionTime;
|
command.LastExecutionTime = lastExecutionTime;
|
||||||
|
command.LastStartTime = lastStartTime;
|
||||||
command.Trigger = trigger;
|
command.Trigger = trigger;
|
||||||
|
|
||||||
return Push(command, priority, trigger);
|
return Push(command, priority, trigger);
|
||||||
|
@ -54,6 +54,7 @@ private static TaskResource ConvertToResource(ScheduledTask scheduledTask)
|
|||||||
TaskName = taskName,
|
TaskName = taskName,
|
||||||
Interval = scheduledTask.Interval,
|
Interval = scheduledTask.Interval,
|
||||||
LastExecution = scheduledTask.LastExecution,
|
LastExecution = scheduledTask.LastExecution,
|
||||||
|
LastStartTime = scheduledTask.LastStartTime,
|
||||||
NextExecution = scheduledTask.LastExecution.AddMinutes(scheduledTask.Interval)
|
NextExecution = scheduledTask.LastExecution.AddMinutes(scheduledTask.Interval)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,9 @@ public class TaskResource : RestResource
|
|||||||
public string TaskName { get; set; }
|
public string TaskName { get; set; }
|
||||||
public int Interval { get; set; }
|
public int Interval { get; set; }
|
||||||
public DateTime LastExecution { get; set; }
|
public DateTime LastExecution { get; set; }
|
||||||
|
public DateTime LastStartTime { get; set; }
|
||||||
public DateTime NextExecution { get; set; }
|
public DateTime NextExecution { get; set; }
|
||||||
|
|
||||||
|
public TimeSpan LastDuration => LastExecution - LastStartTime;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user