Use DI for ILiveTvService

KrzaQ · Feb 13, 2024 · 269d4ad · 269d4ad
1 parent cf904d8
commit 269d4ad
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 25 deletions.
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
@@ -695,8 +695,6 @@ private void FindParts()
                 GetExports<IMetadataSaver>(),
                 GetExports<IExternalId>());
 
-            Resolve<ILiveTvManager>().AddParts(GetExports<ILiveTvService>());
-
             Resolve<IMediaSourceManager>().AddParts(GetExports<IMediaSourceProvider>());
         }
 

diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
@@ -67,12 +67,6 @@ public interface ILiveTvManager
         /// <returns>Task.</returns>
         Task CancelSeriesTimer(string id);
 
-        /// <summary>
-        /// Adds the parts.
-        /// </summary>
-        /// <param name="services">The services.</param>
-        void AddParts(IEnumerable<ILiveTvService> services);
-
         /// <summary>
         /// Gets the timer.
         /// </summary>

diff --git a/src/Jellyfin.LiveTv/Extensions/LiveTvServiceCollectionExtensions.cs b/src/Jellyfin.LiveTv/Extensions/LiveTvServiceCollectionExtensions.cs
@@ -28,6 +28,7 @@ public static void AddLiveTvServices(this IServiceCollection services)
         services.AddSingleton<ITunerHostManager, TunerHostManager>();
         services.AddSingleton<IGuideManager, GuideManager>();
 
+        services.AddSingleton<ILiveTvService, EmbyTV.EmbyTV>();
         services.AddSingleton<ITunerHost, HdHomerunHost>();
         services.AddSingleton<ITunerHost, M3UTunerHost>();
         services.AddSingleton<IListingsProvider, SchedulesDirect>();

diff --git a/src/Jellyfin.LiveTv/LiveTvManager.cs b/src/Jellyfin.LiveTv/LiveTvManager.cs
@@ -48,10 +48,9 @@ public class LiveTvManager : ILiveTvManager
         private readonly ILocalizationManager _localization;
         private readonly IChannelManager _channelManager;
         private readonly LiveTvDtoService _tvDtoService;
+        private readonly ILiveTvService[] _services;
         private readonly IListingsProvider[] _listingProviders;
 
-        private ILiveTvService[] _services = Array.Empty<ILiveTvService>();
-
         public LiveTvManager(
             IServerConfigurationManager config,
             ILogger<LiveTvManager> logger,
@@ -63,6 +62,7 @@ public class LiveTvManager : ILiveTvManager
             ILocalizationManager localization,
             IChannelManager channelManager,
             LiveTvDtoService liveTvDtoService,
+            IEnumerable<ILiveTvService> services,
             IEnumerable<IListingsProvider> listingProviders)
         {
             _config = config;
@@ -75,7 +75,12 @@ public class LiveTvManager : ILiveTvManager
             _userDataManager = userDataManager;
             _channelManager = channelManager;
             _tvDtoService = liveTvDtoService;
+            _services = services.ToArray();
             _listingProviders = listingProviders.ToArray();
+
+            var defaultService = _services.OfType<EmbyTV.EmbyTV>().First();
+            defaultService.TimerCreated += OnEmbyTvTimerCreated;
+            defaultService.TimerCancelled += OnEmbyTvTimerCancelled;
         }
 
         public event EventHandler<GenericEventArgs<TimerEventInfo>> SeriesTimerCancelled;
@@ -99,21 +104,6 @@ public string GetEmbyTvActiveRecordingPath(string id)
             return EmbyTV.EmbyTV.Current.GetActiveRecordingPath(id);
         }
 
-        /// <inheritdoc />
-        public void AddParts(IEnumerable<ILiveTvService> services)
-        {
-            _services = services.ToArray();
-
-            foreach (var service in _services)
-            {
-                if (service is EmbyTV.EmbyTV embyTv)
-                {
-                    embyTv.TimerCreated += OnEmbyTvTimerCreated;
-                    embyTv.TimerCancelled += OnEmbyTvTimerCancelled;
-                }
-            }
-        }
-
         private void OnEmbyTvTimerCancelled(object sender, GenericEventArgs<string> e)
         {
             var timerId = e.Argument;