1 files changed, 28 insertions, 28 deletions

diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
index 3c807a8ea..a861e6ae4 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
@@ -1,12 +1,13 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Concurrent;
 using System.Globalization;
 using System.Linq;
 using System.Threading;
+using Jellyfin.Data.Events;
 using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Model.Events;
 using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Serialization;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.LiveTv.EmbyTV
@@ -14,21 +15,19 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
     public class TimerManager : ItemDataProvider<TimerInfo>
     {
         private readonly ConcurrentDictionary<string, Timer> _timers = new ConcurrentDictionary<string, Timer>(StringComparer.OrdinalIgnoreCase);
-        private readonly ILogger _logger;
-
-        public event EventHandler<GenericEventArgs<TimerInfo>> TimerFired;
 
-        public TimerManager(IJsonSerializer jsonSerializer, ILogger logger, string dataPath, ILogger logger1)
-            : base(jsonSerializer, logger, dataPath, (r1, r2) => string.Equals(r1.Id, r2.Id, StringComparison.OrdinalIgnoreCase))
+        public TimerManager(ILogger logger, string dataPath)
+            : base(logger, dataPath, (r1, r2) => string.Equals(r1.Id, r2.Id, StringComparison.OrdinalIgnoreCase))
         {
-            _logger = logger1;
         }
 
+        public event EventHandler<GenericEventArgs<TimerInfo>>? TimerFired;
+
         public void RestartTimers()
         {
             StopTimers();
 
-            foreach (var item in GetAll().ToList())
+            foreach (var item in GetAll())
             {
                 AddOrUpdateSystemTimer(item);
             }
@@ -64,16 +63,13 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 return;
             }
 
-            var list = GetAll().ToList();
+            base.AddOrUpdate(item);
+        }
 
-            if (!list.Any(i => EqualityComparer(i, item)))
-            {
-                base.Add(item);
-            }
-            else
-            {
-                base.Update(item);
-            }
+        public override void AddOrUpdate(TimerInfo item)
+        {
+            base.AddOrUpdate(item);
+            AddOrUpdateSystemTimer(item);
         }
 
         public override void Add(TimerInfo item)
@@ -89,8 +85,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         private static bool ShouldStartTimer(TimerInfo item)
         {
-            if (item.Status == RecordingStatus.Completed ||
-                item.Status == RecordingStatus.Cancelled)
+            if (item.Status == RecordingStatus.Completed
+                || item.Status == RecordingStatus.Cancelled)
             {
                 return false;
             }
@@ -112,7 +108,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (startDate < now)
             {
-                TimerFired?.Invoke(this, new GenericEventArgs<TimerInfo> { Argument = item });
+                TimerFired?.Invoke(this, new GenericEventArgs<TimerInfo>(item));
                 return;
             }
 
@@ -126,12 +122,16 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (_timers.TryAdd(item.Id, timer))
             {
-                _logger.LogInformation("Creating recording timer for {id}, {name}. Timer will fire in {minutes} minutes", item.Id, item.Name, dueTime.TotalMinutes.ToString(CultureInfo.InvariantCulture));
+                Logger.LogInformation(
+                    "Creating recording timer for {Id}, {Name}. Timer will fire in {Minutes} minutes",
+                    item.Id,
+                    item.Name,
+                    dueTime.TotalMinutes.ToString(CultureInfo.InvariantCulture));
             }
             else
             {
                 timer.Dispose();
-                _logger.LogWarning("Timer already exists for item {id}", item.Id);
+                Logger.LogWarning("Timer already exists for item {Id}", item.Id);
             }
         }
 
@@ -143,23 +143,23 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        private void TimerCallback(object state)
+        private void TimerCallback(object? state)
         {
-            var timerId = (string)state;
+            var timerId = (string?)state ?? throw new ArgumentNullException(nameof(state));
 
             var timer = GetAll().FirstOrDefault(i => string.Equals(i.Id, timerId, StringComparison.OrdinalIgnoreCase));
             if (timer != null)
             {
-                TimerFired?.Invoke(this, new GenericEventArgs<TimerInfo> { Argument = timer });
+                TimerFired?.Invoke(this, new GenericEventArgs<TimerInfo>(timer));
             }
         }
 
-        public TimerInfo GetTimer(string id)
+        public TimerInfo? GetTimer(string id)
         {
             return GetAll().FirstOrDefault(r => string.Equals(r.Id, id, StringComparison.OrdinalIgnoreCase));
         }
 
-        public TimerInfo GetTimerByProgramId(string programId)
+        public TimerInfo? GetTimerByProgramId(string programId)
         {
             return GetAll().FirstOrDefault(r => string.Equals(r.ProgramId, programId, StringComparison.OrdinalIgnoreCase));
         }