Merge branch 'jellyfin:master' into master

1 files changed, 27 insertions, 30 deletions

diff --git a/Emby.Server.Implementations/ScheduledTasks/Triggers/DailyTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/Triggers/DailyTrigger.cs
index 98685cebe..29ab6a73d 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Triggers/DailyTrigger.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Triggers/DailyTrigger.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.Threading;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;
@@ -7,31 +6,40 @@ using Microsoft.Extensions.Logging;
 namespace Emby.Server.Implementations.ScheduledTasks
 {
     /// <summary>
-    /// Represents a task trigger that fires everyday
+    /// Represents a task trigger that fires everyday.
     /// </summary>
-    public class DailyTrigger : ITaskTrigger
+    public sealed class DailyTrigger : ITaskTrigger
     {
+        private readonly TimeSpan _timeOfDay;
+        private Timer? _timer;
+
         /// <summary>
-        /// Get the time of day to trigger the task to run
+        /// Initializes a new instance of the <see cref="DailyTrigger"/> class.
         /// </summary>
-        /// <value>The time of day.</value>
-        public TimeSpan TimeOfDay { get; set; }
+        /// <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;
+        }
 
         /// <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)
         {
@@ -39,18 +47,18 @@ namespace Emby.Server.Implementations.ScheduledTasks
 
             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;
 
-            logger.LogInformation("Daily trigger for {0} set to fire at {1}, which is {2} minutes from now.", taskName, triggerDate.ToString(), dueTime.TotalMinutes.ToString(CultureInfo.InvariantCulture));
+            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(state => OnTriggered(), null, dueTime, TimeSpan.FromMilliseconds(-1));
+            _timer = new Timer(state => OnTriggered(), null, dueTime, TimeSpan.FromMilliseconds(-1));
         }
 
         /// <summary>
-        /// Stops waiting for the trigger action
+        /// Stops waiting for the trigger action.
         /// </summary>
         public void Stop()
         {
@@ -62,26 +70,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);
         }
     }
 }