1 files changed, 30 insertions, 35 deletions

diff --git a/Emby.Server.Implementations/ScheduledTasks/Triggers/WeeklyTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/Triggers/WeeklyTrigger.cs
index 2a6a7b13c..36ae190b0 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Triggers/WeeklyTrigger.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Triggers/WeeklyTrigger.cs
@@ -6,37 +6,43 @@ using Microsoft.Extensions.Logging;
 namespace Emby.Server.Implementations.ScheduledTasks
 {
     /// <summary>
-    /// Represents a task trigger that fires on a weekly basis
+    /// Represents a task trigger that fires on a weekly basis.
     /// </summary>
-    public class WeeklyTrigger : ITaskTrigger
+    public sealed class WeeklyTrigger : ITaskTrigger
     {
-        /// <summary>
-        /// Get the time of day to trigger the task to run
-        /// </summary>
-        /// <value>The time of day.</value>
-        public TimeSpan TimeOfDay { get; set; }
+        private readonly TimeSpan _timeOfDay;
+        private readonly DayOfWeek _dayOfWeek;
+        private Timer? _timer;
 
         /// <summary>
-        /// Gets or sets the day of week.
+        /// Initializes a new instance of the <see cref="WeeklyTrigger"/> class.
         /// </summary>
-        /// <value>The day of week.</value>
-        public DayOfWeek DayOfWeek { get; set; }
+        /// <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;
+        }
 
         /// <summary>
-        /// Gets or sets the options of this task.
+        /// Occurs when [triggered].
         /// </summary>
-        public TaskOptions TaskOptions { get; set; }
+        public event EventHandler<EventArgs>? Triggered;
 
         /// <summary>
-        /// Gets or sets the timer.
+        /// Gets the options of this task.
         /// </summary>
-        /// <value>The timer.</value>
-        private Timer Timer { get; set; }
+        public TaskOptions TaskOptions { get; }
 
         /// <summary>
-        /// Stars waiting for the trigger action
+        /// 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)
         {
@@ -44,7 +50,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
 
             var triggerDate = GetNextTriggerDateTime();
 
-            Timer = new Timer(state => OnTriggered(), null, triggerDate - DateTime.Now, TimeSpan.FromMilliseconds(-1));
+            _timer = new Timer(state => OnTriggered(), null, triggerDate - DateTime.Now, TimeSpan.FromMilliseconds(-1));
         }
 
         /// <summary>
@@ -56,26 +62,26 @@ namespace Emby.Server.Implementations.ScheduledTasks
             var now = DateTime.Now;
 
             // If it's on the same day
-            if (now.DayOfWeek == DayOfWeek)
+            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);
+                return now.TimeOfDay < _timeOfDay ? now.Date.Add(_timeOfDay) : now.Date.AddDays(7).Add(_timeOfDay);
             }
 
             var triggerDate = now.Date;
 
             // Walk the date forward until we get to the trigger day
-            while (triggerDate.DayOfWeek != DayOfWeek)
+            while (triggerDate.DayOfWeek != _dayOfWeek)
             {
                 triggerDate = triggerDate.AddDays(1);
             }
 
             // Return the trigger date plus the time offset
-            return triggerDate.Add(TimeOfDay);
+            return triggerDate.Add(_timeOfDay);
         }
 
         /// <summary>
-        /// Stops waiting for the trigger action
+        /// Stops waiting for the trigger action.
         /// </summary>
         public void Stop()
         {
@@ -87,26 +93,15 @@ namespace Emby.Server.Implementations.ScheduledTasks
         /// </summary>
         private void DisposeTimer()
         {
-            if (Timer != null)
-            {
-                Timer.Dispose();
-            }
+            _timer?.Dispose();
         }
 
         /// <summary>
-        /// Occurs when [triggered].
-        /// </summary>
-        public event EventHandler<EventArgs> Triggered;
-
-        /// <summary>
         /// Called when [triggered].
         /// </summary>
         private void OnTriggered()
         {
-            if (Triggered != null)
-            {
-                Triggered(this, EventArgs.Empty);
-            }
+            Triggered?.Invoke(this, EventArgs.Empty);
         }
     }
 }