From 126aa9c893a5b5e3107ca9b6355d354753d45ed3 Mon Sep 17 00:00:00 2001 From: Patrick Barron Date: Tue, 9 Jan 2024 09:54:02 -0500 Subject: [PATCH] Move channels to LiveTv project --- Emby.Server.Implementations/ApplicationHost.cs | 3 --- Jellyfin.Server/CoreAppHost.cs | 3 +++ .../Channels/ChannelDynamicMediaSourceProvider.cs | 2 +- .../Jellyfin.LiveTv}/Channels/ChannelImageProvider.cs | 2 +- .../Jellyfin.LiveTv}/Channels/ChannelManager.cs | 2 +- .../Jellyfin.LiveTv}/Channels/ChannelPostScanTask.cs | 2 +- .../Jellyfin.LiveTv}/Channels/RefreshChannelsScheduledTask.cs | 2 +- src/Jellyfin.LiveTv/Jellyfin.LiveTv.csproj | 1 + 8 files changed, 9 insertions(+), 8 deletions(-) rename {Emby.Server.Implementations => src/Jellyfin.LiveTv}/Channels/ChannelDynamicMediaSourceProvider.cs (96%) rename {Emby.Server.Implementations => src/Jellyfin.LiveTv}/Channels/ChannelImageProvider.cs (97%) rename {Emby.Server.Implementations => src/Jellyfin.LiveTv}/Channels/ChannelManager.cs (99%) rename {Emby.Server.Implementations => src/Jellyfin.LiveTv}/Channels/ChannelPostScanTask.cs (98%) rename {Emby.Server.Implementations => src/Jellyfin.LiveTv}/Channels/RefreshChannelsScheduledTask.cs (98%) diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index bb565fb2b..0b6f4178b 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -15,7 +15,6 @@ using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; using Emby.Naming.Common; using Emby.Photos; -using Emby.Server.Implementations.Channels; using Emby.Server.Implementations.Collections; using Emby.Server.Implementations.Configuration; using Emby.Server.Implementations.Cryptography; @@ -556,8 +555,6 @@ namespace Emby.Server.Implementations serviceCollection.AddTransient(provider => new Lazy(provider.GetRequiredService)); serviceCollection.AddSingleton(); - serviceCollection.AddSingleton(); - serviceCollection.AddSingleton(); serviceCollection.AddSingleton(); diff --git a/Jellyfin.Server/CoreAppHost.cs b/Jellyfin.Server/CoreAppHost.cs index b1ac51f99..fb01f6edb 100644 --- a/Jellyfin.Server/CoreAppHost.cs +++ b/Jellyfin.Server/CoreAppHost.cs @@ -7,6 +7,7 @@ using Jellyfin.Api.WebSocketListeners; using Jellyfin.Drawing; using Jellyfin.Drawing.Skia; using Jellyfin.LiveTv; +using Jellyfin.LiveTv.Channels; using Jellyfin.Server.Implementations; using Jellyfin.Server.Implementations.Activity; using Jellyfin.Server.Implementations.Devices; @@ -17,6 +18,7 @@ using Jellyfin.Server.Implementations.Users; using MediaBrowser.Controller; using MediaBrowser.Controller.Authentication; using MediaBrowser.Controller.BaseItemManager; +using MediaBrowser.Controller.Channels; using MediaBrowser.Controller.Devices; using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Events; @@ -100,6 +102,7 @@ namespace Jellyfin.Server serviceCollection.AddSingleton(); serviceCollection.AddSingleton(); + serviceCollection.AddSingleton(); foreach (var type in GetExportTypes()) { diff --git a/Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs b/src/Jellyfin.LiveTv/Channels/ChannelDynamicMediaSourceProvider.cs similarity index 96% rename from Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs rename to src/Jellyfin.LiveTv/Channels/ChannelDynamicMediaSourceProvider.cs index 3e149cc82..839549ed6 100644 --- a/Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs +++ b/src/Jellyfin.LiveTv/Channels/ChannelDynamicMediaSourceProvider.cs @@ -8,7 +8,7 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Dto; -namespace Emby.Server.Implementations.Channels +namespace Jellyfin.LiveTv.Channels { /// /// A media source provider for channels. diff --git a/Emby.Server.Implementations/Channels/ChannelImageProvider.cs b/src/Jellyfin.LiveTv/Channels/ChannelImageProvider.cs similarity index 97% rename from Emby.Server.Implementations/Channels/ChannelImageProvider.cs rename to src/Jellyfin.LiveTv/Channels/ChannelImageProvider.cs index 25cbfcf14..32e224550 100644 --- a/Emby.Server.Implementations/Channels/ChannelImageProvider.cs +++ b/src/Jellyfin.LiveTv/Channels/ChannelImageProvider.cs @@ -7,7 +7,7 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Entities; -namespace Emby.Server.Implementations.Channels +namespace Jellyfin.LiveTv.Channels { /// /// An image provider for channels. diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/src/Jellyfin.LiveTv/Channels/ChannelManager.cs similarity index 99% rename from Emby.Server.Implementations/Channels/ChannelManager.cs rename to src/Jellyfin.LiveTv/Channels/ChannelManager.cs index c505e8fe1..f5ce75ff4 100644 --- a/Emby.Server.Implementations/Channels/ChannelManager.cs +++ b/src/Jellyfin.LiveTv/Channels/ChannelManager.cs @@ -34,7 +34,7 @@ using MusicAlbum = MediaBrowser.Controller.Entities.Audio.MusicAlbum; using Season = MediaBrowser.Controller.Entities.TV.Season; using Series = MediaBrowser.Controller.Entities.TV.Series; -namespace Emby.Server.Implementations.Channels +namespace Jellyfin.LiveTv.Channels { /// /// The LiveTV channel manager. diff --git a/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs b/src/Jellyfin.LiveTv/Channels/ChannelPostScanTask.cs similarity index 98% rename from Emby.Server.Implementations/Channels/ChannelPostScanTask.cs rename to src/Jellyfin.LiveTv/Channels/ChannelPostScanTask.cs index b358ba4d5..b4f6cf731 100644 --- a/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs +++ b/src/Jellyfin.LiveTv/Channels/ChannelPostScanTask.cs @@ -8,7 +8,7 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using Microsoft.Extensions.Logging; -namespace Emby.Server.Implementations.Channels +namespace Jellyfin.LiveTv.Channels { /// /// A task to remove all non-installed channels from the database. diff --git a/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs b/src/Jellyfin.LiveTv/Channels/RefreshChannelsScheduledTask.cs similarity index 98% rename from Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs rename to src/Jellyfin.LiveTv/Channels/RefreshChannelsScheduledTask.cs index cfd08e653..556e052d4 100644 --- a/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs +++ b/src/Jellyfin.LiveTv/Channels/RefreshChannelsScheduledTask.cs @@ -9,7 +9,7 @@ using MediaBrowser.Model.Globalization; using MediaBrowser.Model.Tasks; using Microsoft.Extensions.Logging; -namespace Emby.Server.Implementations.Channels +namespace Jellyfin.LiveTv.Channels { /// /// The "Refresh Channels" scheduled task. diff --git a/src/Jellyfin.LiveTv/Jellyfin.LiveTv.csproj b/src/Jellyfin.LiveTv/Jellyfin.LiveTv.csproj index 391006449..5a826a1da 100644 --- a/src/Jellyfin.LiveTv/Jellyfin.LiveTv.csproj +++ b/src/Jellyfin.LiveTv/Jellyfin.LiveTv.csproj @@ -12,6 +12,7 @@ +