Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Run DeleteTranscodeFileTask on startup (#12239)

Browse Source
This commit is contained in:
Bond-009 2024-07-15 14:55:31 +02:00 committed by GitHub
parent fc1bee30a6
commit f68038f2cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
View File

@ -62,14 +62,15 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
/// <inheritdoc /> /// <inheritdoc />
public bool IsLogged => true; public bool IsLogged => true;
/// <summary> /// <inheritdoc />
/// Creates the triggers that define when the task will run.
/// </summary>
/// <returns>IEnumerable{BaseTaskTrigger}.</returns>
public IEnumerable<TaskTriggerInfo> GetDefaultTriggers() public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
{ {
return new[] return new[]
{ {
new TaskTriggerInfo
{
Type = TaskTriggerInfo.TriggerStartup
},
new TaskTriggerInfo new TaskTriggerInfo
{ {
Type = TaskTriggerInfo.TriggerInterval, Type = TaskTriggerInfo.TriggerInterval,

32
Emby.Server.Implementations/ScheduledTasks/Triggers/IntervalTrigger.cs
View File

@ -27,45 +27,31 @@ namespace Emby.Server.Implementations.ScheduledTasks.Triggers
TaskOptions = taskOptions; TaskOptions = taskOptions;
} }
/// <summary> /// <inheritdoc />
/// Occurs when [triggered].
/// </summary>
public event EventHandler<EventArgs>? Triggered; public event EventHandler<EventArgs>? Triggered;
/// <summary> /// <inheritdoc />
/// Gets the options of this task.
/// </summary>
public TaskOptions TaskOptions { get; } public TaskOptions TaskOptions { get; }
/// <summary> /// <inheritdoc />
/// Stars waiting for the trigger action.
/// </summary>
/// <param name="lastResult">The last result.</param>
/// <param name="logger">The logger.</param>
/// <param name="taskName">The name of the task.</param>
/// <param name="isApplicationStartup">if set to <c>true</c> [is application startup].</param>
public void Start(TaskResult? lastResult, ILogger logger, string taskName, bool isApplicationStartup) public void Start(TaskResult? lastResult, ILogger logger, string taskName, bool isApplicationStartup)
{ {
DisposeTimer(); DisposeTimer();
DateTime now = DateTime.UtcNow;
DateTime triggerDate; DateTime triggerDate;
if (lastResult is null) if (lastResult is null)
{ {
// Task has never been completed before // Task has never been completed before
triggerDate = DateTime.UtcNow.AddHours(1); triggerDate = now.AddHours(1);
} }
else else
{ {
triggerDate = new[] { lastResult.EndTimeUtc, _lastStartDate }.Max().Add(_interval); triggerDate = new[] { lastResult.EndTimeUtc, _lastStartDate, now.AddMinutes(1) }.Max().Add(_interval);
} }
if (DateTime.UtcNow > triggerDate) var dueTime = triggerDate - now;
{
triggerDate = DateTime.UtcNow.AddMinutes(1);
}
var dueTime = triggerDate - DateTime.UtcNow;
var maxDueTime = TimeSpan.FromDays(7); var maxDueTime = TimeSpan.FromDays(7);
if (dueTime > maxDueTime) if (dueTime > maxDueTime)
@ -76,9 +62,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Triggers
_timer = new Timer(_ => OnTriggered(), null, dueTime, TimeSpan.FromMilliseconds(-1)); _timer = new Timer(_ => OnTriggered(), null, dueTime, TimeSpan.FromMilliseconds(-1));
} }
/// <summary> /// <inheritdoc />
/// Stops waiting for the trigger action.
/// </summary>
public void Stop() public void Stop()
{ {
DisposeTimer(); DisposeTimer();

1
MediaBrowser.Model/Tasks/TaskTriggerInfo.cs
View File

@ -13,7 +13,6 @@ namespace MediaBrowser.Model.Tasks
public const string TriggerDaily = "DailyTrigger"; public const string TriggerDaily = "DailyTrigger";
public const string TriggerWeekly = "WeeklyTrigger"; public const string TriggerWeekly = "WeeklyTrigger";
public const string TriggerInterval = "IntervalTrigger"; public const string TriggerInterval = "IntervalTrigger";
public const string TriggerSystemEvent = "SystemEventTrigger";
public const string TriggerStartup = "StartupTrigger"; public const string TriggerStartup = "StartupTrigger";
/// <summary> /// <summary>