Merge pull request #14028 from Shadowghost/cleanup-tasks

Cleanup Tasks and Validators

4 files changed, 251 insertions, 255 deletions

diff --git a/Emby.Server.Implementations/ScheduledTasks/Triggers/DailyTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/Triggers/DailyTrigger.cs
index 6d2a74da4..9abcd9c7b 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Triggers/DailyTrigger.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Triggers/DailyTrigger.cs
@@ -3,85 +3,84 @@ using System.Threading;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Emby.Server.Implementations.ScheduledTasks.Triggers
+namespace Emby.Server.Implementations.ScheduledTasks.Triggers;
+
+/// <summary>
+/// Represents a task trigger that fires everyday.
+/// </summary>
+public sealed class DailyTrigger : ITaskTrigger, IDisposable
 {
+    private readonly TimeSpan _timeOfDay;
+    private Timer? _timer;
+    private bool _disposed;
+
     /// <summary>
-    /// Represents a task trigger that fires everyday.
+    /// Initializes a new instance of the <see cref="DailyTrigger"/> class.
     /// </summary>
-    public sealed class DailyTrigger : ITaskTrigger, IDisposable
+    /// <param name="timeOfDay">The time of day to trigger the task to run.</param>
+    /// <param name="taskOptions">The options of this task.</param>
+    public DailyTrigger(TimeSpan timeOfDay, TaskOptions taskOptions)
     {
-        private readonly TimeSpan _timeOfDay;
-        private Timer? _timer;
-        private bool _disposed = false;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DailyTrigger"/> class.
-        /// </summary>
-        /// <param name="timeofDay">The time of day to trigger the task to run.</param>
-        /// <param name="taskOptions">The options of this task.</param>
-        public DailyTrigger(TimeSpan timeofDay, TaskOptions taskOptions)
-        {
-            _timeOfDay = timeofDay;
-            TaskOptions = taskOptions;
-        }
+        _timeOfDay = timeOfDay;
+        TaskOptions = taskOptions;
+    }
 
-        /// <inheritdoc />
-        public event EventHandler<EventArgs>? Triggered;
+    /// <inheritdoc />
+    public event EventHandler<EventArgs>? Triggered;
 
-        /// <inheritdoc />
-        public TaskOptions TaskOptions { get; }
+    /// <inheritdoc />
+    public TaskOptions TaskOptions { get; }
 
-        /// <inheritdoc />
-        public void Start(TaskResult? lastResult, ILogger logger, string taskName, bool isApplicationStartup)
-        {
-            DisposeTimer();
+    /// <inheritdoc />
+    public void Start(TaskResult? lastResult, ILogger logger, string taskName, bool isApplicationStartup)
+    {
+        DisposeTimer();
 
-            var now = DateTime.Now;
+        var now = DateTime.Now;
 
-            var triggerDate = now.TimeOfDay > _timeOfDay ? now.Date.AddDays(1) : now.Date;
-            triggerDate = triggerDate.Add(_timeOfDay);
+        var triggerDate = now.TimeOfDay > _timeOfDay ? now.Date.AddDays(1) : now.Date;
+        triggerDate = triggerDate.Add(_timeOfDay);
 
-            var dueTime = triggerDate - now;
+        var dueTime = triggerDate - now;
 
-            logger.LogInformation("Daily trigger for {Task} set to fire at {TriggerDate:yyyy-MM-dd HH:mm:ss.fff zzz}, which is {DueTime:c} from now.", taskName, triggerDate, dueTime);
+        logger.LogInformation("Daily trigger for {Task} set to fire at {TriggerDate:yyyy-MM-dd HH:mm:ss.fff zzz}, which is {DueTime:c} from now.", taskName, triggerDate, dueTime);
 
-            _timer = new Timer(_ => OnTriggered(), null, dueTime, TimeSpan.FromMilliseconds(-1));
-        }
+        _timer = new Timer(_ => OnTriggered(), null, dueTime, TimeSpan.FromMilliseconds(-1));
+    }
 
-        /// <inheritdoc />
-        public void Stop()
-        {
-            DisposeTimer();
-        }
+    /// <inheritdoc />
+    public void Stop()
+    {
+        DisposeTimer();
+    }
 
-        /// <summary>
-        /// Disposes the timer.
-        /// </summary>
-        private void DisposeTimer()
-        {
-            _timer?.Dispose();
-            _timer = null;
-        }
+    /// <summary>
+    /// Disposes the timer.
+    /// </summary>
+    private void DisposeTimer()
+    {
+        _timer?.Dispose();
+        _timer = null;
+    }
 
-        /// <summary>
-        /// Called when [triggered].
-        /// </summary>
-        private void OnTriggered()
-        {
-            Triggered?.Invoke(this, EventArgs.Empty);
-        }
+    /// <summary>
+    /// Called when [triggered].
+    /// </summary>
+    private void OnTriggered()
+    {
+        Triggered?.Invoke(this, EventArgs.Empty);
+    }
 
-        /// <inheritdoc />
-        public void Dispose()
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        if (_disposed)
         {
-            if (_disposed)
-            {
-                return;
-            }
+            return;
+        }
 
-            DisposeTimer();
+        DisposeTimer();
 
-            _disposed = true;
-        }
+        _disposed = true;
     }
 }
diff --git a/Emby.Server.Implementations/ScheduledTasks/Triggers/IntervalTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/Triggers/IntervalTrigger.cs
index 9425b47d0..d6773b65e 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Triggers/IntervalTrigger.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Triggers/IntervalTrigger.cs
@@ -4,104 +4,103 @@ using System.Threading;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Emby.Server.Implementations.ScheduledTasks.Triggers
+namespace Emby.Server.Implementations.ScheduledTasks.Triggers;
+
+/// <summary>
+/// Represents a task trigger that runs repeatedly on an interval.
+/// </summary>
+public sealed class IntervalTrigger : ITaskTrigger, IDisposable
 {
+    private readonly TimeSpan _interval;
+    private DateTime _lastStartDate;
+    private Timer? _timer;
+    private bool _disposed;
+
     /// <summary>
-    /// Represents a task trigger that runs repeatedly on an interval.
+    /// Initializes a new instance of the <see cref="IntervalTrigger"/> class.
     /// </summary>
-    public sealed class IntervalTrigger : ITaskTrigger, IDisposable
+    /// <param name="interval">The interval.</param>
+    /// <param name="taskOptions">The options of this task.</param>
+    public IntervalTrigger(TimeSpan interval, TaskOptions taskOptions)
     {
-        private readonly TimeSpan _interval;
-        private DateTime _lastStartDate;
-        private Timer? _timer;
-        private bool _disposed = false;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IntervalTrigger"/> class.
-        /// </summary>
-        /// <param name="interval">The interval.</param>
-        /// <param name="taskOptions">The options of this task.</param>
-        public IntervalTrigger(TimeSpan interval, TaskOptions taskOptions)
-        {
-            _interval = interval;
-            TaskOptions = taskOptions;
-        }
+        _interval = interval;
+        TaskOptions = taskOptions;
+    }
+
+    /// <inheritdoc />
+    public event EventHandler<EventArgs>? Triggered;
 
-        /// <inheritdoc />
-        public event EventHandler<EventArgs>? Triggered;
+    /// <inheritdoc />
+    public TaskOptions TaskOptions { get; }
+
+    /// <inheritdoc />
+    public void Start(TaskResult? lastResult, ILogger logger, string taskName, bool isApplicationStartup)
+    {
+        DisposeTimer();
 
-        /// <inheritdoc />
-        public TaskOptions TaskOptions { get; }
+        DateTime now = DateTime.UtcNow;
+        DateTime triggerDate;
 
-        /// <inheritdoc />
-        public void Start(TaskResult? lastResult, ILogger logger, string taskName, bool isApplicationStartup)
+        if (lastResult is null)
         {
-            DisposeTimer();
-
-            DateTime now = DateTime.UtcNow;
-            DateTime triggerDate;
-
-            if (lastResult is null)
-            {
-                // Task has never been completed before
-                triggerDate = now.AddHours(1);
-            }
-            else
-            {
-                triggerDate = new[] { lastResult.EndTimeUtc, _lastStartDate, now.AddMinutes(1) }.Max().Add(_interval);
-            }
-
-            var dueTime = triggerDate - now;
-            var maxDueTime = TimeSpan.FromDays(7);
-
-            if (dueTime > maxDueTime)
-            {
-                dueTime = maxDueTime;
-            }
-
-            _timer = new Timer(_ => OnTriggered(), null, dueTime, TimeSpan.FromMilliseconds(-1));
+            // Task has never been completed before
+            triggerDate = now.AddHours(1);
         }
-
-        /// <inheritdoc />
-        public void Stop()
+        else
         {
-            DisposeTimer();
+            triggerDate = new[] { lastResult.EndTimeUtc, _lastStartDate, now.AddMinutes(1) }.Max().Add(_interval);
         }
 
-        /// <summary>
-        /// Disposes the timer.
-        /// </summary>
-        private void DisposeTimer()
+        var dueTime = triggerDate - now;
+        var maxDueTime = TimeSpan.FromDays(7);
+
+        if (dueTime > maxDueTime)
         {
-            _timer?.Dispose();
-            _timer = null;
+            dueTime = maxDueTime;
         }
 
-        /// <summary>
-        /// Called when [triggered].
-        /// </summary>
-        private void OnTriggered()
-        {
-            DisposeTimer();
+        _timer = new Timer(_ => OnTriggered(), null, dueTime, TimeSpan.FromMilliseconds(-1));
+    }
+
+    /// <inheritdoc />
+    public void Stop()
+    {
+        DisposeTimer();
+    }
 
-            if (Triggered is not null)
-            {
-                _lastStartDate = DateTime.UtcNow;
-                Triggered(this, EventArgs.Empty);
-            }
+    /// <summary>
+    /// Disposes the timer.
+    /// </summary>
+    private void DisposeTimer()
+    {
+        _timer?.Dispose();
+        _timer = null;
+    }
+
+    /// <summary>
+    /// Called when [triggered].
+    /// </summary>
+    private void OnTriggered()
+    {
+        DisposeTimer();
+
+        if (Triggered is not null)
+        {
+            _lastStartDate = DateTime.UtcNow;
+            Triggered(this, EventArgs.Empty);
         }
+    }
 
-        /// <inheritdoc />
-        public void Dispose()
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        if (_disposed)
         {
-            if (_disposed)
-            {
-                return;
-            }
+            return;
+        }
 
-            DisposeTimer();
+        DisposeTimer();
 
-            _disposed = true;
-        }
+        _disposed = true;
     }
 }
diff --git a/Emby.Server.Implementations/ScheduledTasks/Triggers/StartupTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/Triggers/StartupTrigger.cs
index 535aa20f9..86ceff6ce 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Triggers/StartupTrigger.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Triggers/StartupTrigger.cs
@@ -3,52 +3,51 @@ using System.Threading.Tasks;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Emby.Server.Implementations.ScheduledTasks.Triggers
+namespace Emby.Server.Implementations.ScheduledTasks.Triggers;
+
+/// <summary>
+/// Class StartupTaskTrigger.
+/// </summary>
+public sealed class StartupTrigger : ITaskTrigger
 {
+    private const int DelayMs = 3000;
+
     /// <summary>
-    /// Class StartupTaskTrigger.
+    /// Initializes a new instance of the <see cref="StartupTrigger"/> class.
     /// </summary>
-    public sealed class StartupTrigger : ITaskTrigger
+    /// <param name="taskOptions">The options of this task.</param>
+    public StartupTrigger(TaskOptions taskOptions)
     {
-        private const int DelayMs = 3000;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StartupTrigger"/> class.
-        /// </summary>
-        /// <param name="taskOptions">The options of this task.</param>
-        public StartupTrigger(TaskOptions taskOptions)
-        {
-            TaskOptions = taskOptions;
-        }
+        TaskOptions = taskOptions;
+    }
 
-        /// <inheritdoc />
-        public event EventHandler<EventArgs>? Triggered;
+    /// <inheritdoc />
+    public event EventHandler<EventArgs>? Triggered;
 
-        /// <inheritdoc />
-        public TaskOptions TaskOptions { get; }
+    /// <inheritdoc />
+    public TaskOptions TaskOptions { get; }
 
-        /// <inheritdoc />
-        public async void Start(TaskResult? lastResult, ILogger logger, string taskName, bool isApplicationStartup)
+    /// <inheritdoc />
+    public async void Start(TaskResult? lastResult, ILogger logger, string taskName, bool isApplicationStartup)
+    {
+        if (isApplicationStartup)
         {
-            if (isApplicationStartup)
-            {
-                await Task.Delay(DelayMs).ConfigureAwait(false);
+            await Task.Delay(DelayMs).ConfigureAwait(false);
 
-                OnTriggered();
-            }
+            OnTriggered();
         }
+    }
 
-        /// <inheritdoc />
-        public void Stop()
-        {
-        }
+    /// <inheritdoc />
+    public void Stop()
+    {
+    }
 
-        /// <summary>
-        /// Called when [triggered].
-        /// </summary>
-        private void OnTriggered()
-        {
-            Triggered?.Invoke(this, EventArgs.Empty);
-        }
+    /// <summary>
+    /// Called when [triggered].
+    /// </summary>
+    private void OnTriggered()
+    {
+        Triggered?.Invoke(this, EventArgs.Empty);
     }
 }
diff --git a/Emby.Server.Implementations/ScheduledTasks/Triggers/WeeklyTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/Triggers/WeeklyTrigger.cs
index ad94fdda5..79568f8a1 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Triggers/WeeklyTrigger.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Triggers/WeeklyTrigger.cs
@@ -3,108 +3,107 @@ using System.Threading;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Emby.Server.Implementations.ScheduledTasks.Triggers
+namespace Emby.Server.Implementations.ScheduledTasks.Triggers;
+
+/// <summary>
+/// Represents a task trigger that fires on a weekly basis.
+/// </summary>
+public sealed class WeeklyTrigger : ITaskTrigger, IDisposable
 {
+    private readonly TimeSpan _timeOfDay;
+    private readonly DayOfWeek _dayOfWeek;
+    private Timer? _timer;
+    private bool _disposed;
+
     /// <summary>
-    /// Represents a task trigger that fires on a weekly basis.
+    /// Initializes a new instance of the <see cref="WeeklyTrigger"/> class.
     /// </summary>
-    public sealed class WeeklyTrigger : ITaskTrigger, IDisposable
+    /// <param name="timeOfDay">The time of day to trigger the task to run.</param>
+    /// <param name="dayOfWeek">The day of week.</param>
+    /// <param name="taskOptions">The options of this task.</param>
+    public WeeklyTrigger(TimeSpan timeOfDay, DayOfWeek dayOfWeek, TaskOptions taskOptions)
     {
-        private readonly TimeSpan _timeOfDay;
-        private readonly DayOfWeek _dayOfWeek;
-        private Timer? _timer;
-        private bool _disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WeeklyTrigger"/> class.
-        /// </summary>
-        /// <param name="timeofDay">The time of day to trigger the task to run.</param>
-        /// <param name="dayOfWeek">The day of week.</param>
-        /// <param name="taskOptions">The options of this task.</param>
-        public WeeklyTrigger(TimeSpan timeofDay, DayOfWeek dayOfWeek, TaskOptions taskOptions)
-        {
-            _timeOfDay = timeofDay;
-            _dayOfWeek = dayOfWeek;
-            TaskOptions = taskOptions;
-        }
+        _timeOfDay = timeOfDay;
+        _dayOfWeek = dayOfWeek;
+        TaskOptions = taskOptions;
+    }
 
-        /// <inheritdoc />
-        public event EventHandler<EventArgs>? Triggered;
+    /// <inheritdoc />
+    public event EventHandler<EventArgs>? Triggered;
 
-        /// <inheritdoc />
-        public TaskOptions TaskOptions { get; }
+    /// <inheritdoc />
+    public TaskOptions TaskOptions { get; }
 
-        /// <inheritdoc />
-        public void Start(TaskResult? lastResult, ILogger logger, string taskName, bool isApplicationStartup)
-        {
-            DisposeTimer();
+    /// <inheritdoc />
+    public void Start(TaskResult? lastResult, ILogger logger, string taskName, bool isApplicationStartup)
+    {
+        DisposeTimer();
 
-            var triggerDate = GetNextTriggerDateTime();
+        var triggerDate = GetNextTriggerDateTime();
 
-            _timer = new Timer(_ => OnTriggered(), null, triggerDate - DateTime.Now, TimeSpan.FromMilliseconds(-1));
-        }
+        _timer = new Timer(_ => OnTriggered(), null, triggerDate - DateTime.Now, TimeSpan.FromMilliseconds(-1));
+    }
 
-        /// <summary>
-        /// Gets the next trigger date time.
-        /// </summary>
-        /// <returns>DateTime.</returns>
-        private DateTime GetNextTriggerDateTime()
+    /// <summary>
+    /// Gets the next trigger date time.
+    /// </summary>
+    /// <returns>DateTime.</returns>
+    private DateTime GetNextTriggerDateTime()
+    {
+        var now = DateTime.Now;
+
+        // If it's on the same day
+        if (now.DayOfWeek == _dayOfWeek)
         {
-            var now = DateTime.Now;
+            // It's either later today, or a week from now
+            return now.TimeOfDay < _timeOfDay ? now.Date.Add(_timeOfDay) : now.Date.AddDays(7).Add(_timeOfDay);
+        }
 
-            // If it's on the same day
-            if (now.DayOfWeek == _dayOfWeek)
-            {
-                // It's either later today, or a week from now
-                return now.TimeOfDay < _timeOfDay ? now.Date.Add(_timeOfDay) : now.Date.AddDays(7).Add(_timeOfDay);
-            }
+        var triggerDate = now.Date;
 
-            var triggerDate = now.Date;
+        // Walk the date forward until we get to the trigger day
+        while (triggerDate.DayOfWeek != _dayOfWeek)
+        {
+            triggerDate = triggerDate.AddDays(1);
+        }
 
-            // Walk the date forward until we get to the trigger day
-            while (triggerDate.DayOfWeek != _dayOfWeek)
-            {
-                triggerDate = triggerDate.AddDays(1);
-            }
+        // Return the trigger date plus the time offset
+        return triggerDate.Add(_timeOfDay);
+    }
 
-            // Return the trigger date plus the time offset
-            return triggerDate.Add(_timeOfDay);
-        }
+    /// <inheritdoc />
+    public void Stop()
+    {
+        DisposeTimer();
+    }
 
-        /// <inheritdoc />
-        public void Stop()
-        {
-            DisposeTimer();
-        }
+    /// <summary>
+    /// Disposes the timer.
+    /// </summary>
+    private void DisposeTimer()
+    {
+        _timer?.Dispose();
+        _timer = null;
+    }
 
-        /// <summary>
-        /// Disposes the timer.
-        /// </summary>
-        private void DisposeTimer()
-        {
-            _timer?.Dispose();
-            _timer = null;
-        }
+    /// <summary>
+    /// Called when [triggered].
+    /// </summary>
+    private void OnTriggered()
+    {
+        Triggered?.Invoke(this, EventArgs.Empty);
+    }
 
-        /// <summary>
-        /// Called when [triggered].
-        /// </summary>
-        private void OnTriggered()
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        if (_disposed)
         {
-            Triggered?.Invoke(this, EventArgs.Empty);
+            return;
         }
 
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            DisposeTimer();
+        DisposeTimer();
 
-            _disposed = true;
-        }
+        _disposed = true;
     }
 }