Update for Jellyfin 10.9

knackebrot · knackebrot · commit d38c1595d8fd · 2024-06-22T20:16:55.000+02:00
diff --git a/Jellyfin.Plugin.Enigma2/Jellyfin.Plugin.Enigma2.csproj b/Jellyfin.Plugin.Enigma2/Jellyfin.Plugin.Enigma2.csproj
@@ -1,16 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-    <AssemblyVersion>5.0.1.0</AssemblyVersion>
-    <FileVersion>5.0.1.0</FileVersion>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <AssemblyVersion>6.0.0.0</AssemblyVersion>
+    <FileVersion>6.0.0.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Remove="Configuration\configPage.html" />
   </ItemGroup>
@@ -20,12 +24,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jellyfin.Common" Version="10.8.0" />
-    <PackageReference Include="Jellyfin.Naming" Version="10.8.0" />
-    <PackageReference Include="Jellyfin.Controller" Version="10.8.0" />
-    <PackageReference Include="Jellyfin.Model" Version="10.8.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Jellyfin.Common" Version="10.9.0" />
+    <PackageReference Include="Jellyfin.Naming" Version="10.9.0" />
+    <PackageReference Include="Jellyfin.Controller" Version="10.9.0" />
+    <PackageReference Include="Jellyfin.Model" Version="10.9.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Jellyfin.Plugin.Enigma2/LiveTvService.cs b/Jellyfin.Plugin.Enigma2/LiveTvService.cs
@@ -35,12 +35,15 @@ public class LiveTvService : ILiveTvService
 
         public DateTime LastRecordingChange = DateTime.MinValue;
 
-        private readonly HttpClient _httpClient;
+        private IHttpClientFactory _httpClientFactory;
+
+        public static LiveTvService Instance { get; private set; }
 
         public LiveTvService(ILogger<LiveTvService> logger, IHttpClientFactory httpClientFactory)
         {
             _logger = logger;
-            _httpClient = GetHttpClient(httpClientFactory);
+            _httpClientFactory = httpClientFactory;
+            Instance = this;
         }
 
 
@@ -49,7 +52,7 @@ public LiveTvService(ILogger<LiveTvService> logger, IHttpClientFactory httpClien
         /// </summary>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        private async Task EnsureConnectionAsync(CancellationToken cancellationToken)
+        public async Task EnsureConnectionAsync(CancellationToken cancellationToken)
         {
             _logger.LogInformation("[Enigma2] Start EnsureConnectionAsync");
 
@@ -151,9 +154,9 @@ private async Task EnsureConnectionAsync(CancellationToken cancellationToken)
         /// </summary>
         /// <param name="httpClientFactory"></param>
         /// <returns></returns>
-        private HttpClient GetHttpClient(IHttpClientFactory httpClientFactory)
+        private HttpClient GetHttpClient()
         {
-            var httpClient = httpClientFactory.CreateClient(NamedClient.Default);
+            var httpClient = _httpClientFactory.CreateClient(NamedClient.Default);
             httpClient.DefaultRequestHeaders.UserAgent.Add(
                 new ProductInfoHeaderValue(Name, Plugin.Instance.Version.ToString()));
 
@@ -189,7 +192,7 @@ public async Task<string> InitiateSession(CancellationToken cancellationToken, s
             var url = string.Format("{0}/web/getservices", baseUrl);
             UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] InitiateSession url: {0}", url));
 
-            using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
+            using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
                 using (var reader = new StreamReader(stream))
                 {
@@ -290,7 +293,7 @@ public async Task<IEnumerable<ChannelInfo>> GetChannelsAsync(CancellationToken c
                 baseUrlPicon = protocol + "://" + Plugin.Instance.Configuration.WebInterfaceUsername + ":" + Plugin.Instance.Configuration.WebInterfacePassword + "@" + Plugin.Instance.Configuration.HostName + ":" + Plugin.Instance.Configuration.WebInterfacePort;
             }
 
-            using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
+            using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
                 using (var reader = new StreamReader(stream))
                 {
@@ -454,7 +457,7 @@ public async Task<List<ChannelInfo>> GetChannelsForTVBouquetAsync(CancellationTo
                 baseUrlPicon = protocol + "://" + Plugin.Instance.Configuration.WebInterfaceUsername + ":" + Plugin.Instance.Configuration.WebInterfacePassword + "@" + Plugin.Instance.Configuration.HostName + ":" + Plugin.Instance.Configuration.WebInterfacePort;
             }
 
-            using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
+            using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
                 using (var reader = new StreamReader(stream))
                 {
@@ -555,11 +558,11 @@ public async Task<List<ChannelInfo>> GetChannelsForTVBouquetAsync(CancellationTo
         /// Gets the Recordings async
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{IEnumerable{RecordingInfo}}</returns>
-        public async Task<IEnumerable<RecordingInfo>> GetRecordingsAsync(CancellationToken cancellationToken)
+        /// <returns>Task{IEnumerable{MyRecordingInfo}}</returns>
+        public async Task<IEnumerable<MyRecordingInfo>> GetRecordingsAsync(CancellationToken cancellationToken)
         {
             await Task.Delay(0); //to avoid await warnings
-            return new List<RecordingInfo>();
+            return new List<MyRecordingInfo>();
         }
 
         public async Task<IEnumerable<MyRecordingInfo>> GetAllRecordingsAsync(CancellationToken cancellationToken)
@@ -578,7 +581,7 @@ public async Task<IEnumerable<MyRecordingInfo>> GetAllRecordingsAsync(Cancellati
             var url = string.Format("{0}/web/movielist", baseUrl);
             UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] GetRecordingsAsync url: {0}", url));
 
-            using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
+            using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
                 using (var reader = new StreamReader(stream))
                 {
@@ -757,7 +760,7 @@ public async Task DeleteRecordingAsync(string recordingId, CancellationToken can
             var url = string.Format("{0}/web/moviedelete?sRef={1}", baseUrl, recordingId);
             UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] DeleteRecordingAsync url: {0}", url));
 
-            using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
+            using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
                 using (var reader = new StreamReader(stream))
                 {
@@ -772,7 +775,7 @@ public async Task DeleteRecordingAsync(string recordingId, CancellationToken can
                         var e2simplexmlresult = xml.GetElementsByTagName("e2simplexmlresult");
                         foreach (XmlNode xmlNode in e2simplexmlresult)
                         {
-                            var recordingInfo = new RecordingInfo();
+                            var recordingInfo = new MyRecordingInfo();
 
                             var e2state = "?";
                             var e2statetext = "?";
@@ -837,7 +840,7 @@ public async Task CancelTimerAsync(string timerId, CancellationToken cancellatio
             var url = string.Format("{0}/web/timerdelete?sRef={1}&begin={2}&end={3}", baseUrl, sRef, begin, end);
             UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] CancelTimerAsync url: {0}", url));
 
-            using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
+            using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
                 using (var reader = new StreamReader(stream))
                 {
@@ -852,7 +855,7 @@ public async Task CancelTimerAsync(string timerId, CancellationToken cancellatio
                         var e2simplexmlresult = xml.GetElementsByTagName("e2simplexmlresult");
                         foreach (XmlNode xmlNode in e2simplexmlresult)
                         {
-                            var recordingInfo = new RecordingInfo();
+                            var recordingInfo = new MyRecordingInfo();
 
                             var e2state = "?";
                             var e2statetext = "?";
@@ -920,7 +923,7 @@ public async Task CreateTimerAsync(TimerInfo info, CancellationToken cancellatio
 
             UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] CreateTimerAsync url: {0}", url));
 
-            using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
+            using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
                 using (var reader = new StreamReader(stream))
                 {
@@ -935,7 +938,7 @@ public async Task CreateTimerAsync(TimerInfo info, CancellationToken cancellatio
                         var e2simplexmlresult = xml.GetElementsByTagName("e2simplexmlresult");
                         foreach (XmlNode xmlNode in e2simplexmlresult)
                         {
-                            var recordingInfo = new RecordingInfo();
+                            var recordingInfo = new MyRecordingInfo();
 
                             var e2state = "?";
                             var e2statetext = "?";
@@ -992,7 +995,7 @@ public async Task<IEnumerable<TimerInfo>> GetTimersAsync(CancellationToken cance
             var url = string.Format("{0}/web/timerlist", baseUrl);
             UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] GetTimersAsync url: {0}", url));
 
-            using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
+            using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
                 using (var reader = new StreamReader(stream))
                 {
@@ -1215,7 +1218,7 @@ public async Task ZapToChannel(CancellationToken cancellationToken, string chann
             var url = string.Format("{0}/web/zap?sRef={1}", baseUrl, channelOid);
             UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] ZapToChannel url: {0}", url));
 
-            using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
+            using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
                 using (var reader = new StreamReader(stream))
                 {
@@ -1230,7 +1233,7 @@ public async Task ZapToChannel(CancellationToken cancellationToken, string chann
                         var e2simplexmlresult = xml.GetElementsByTagName("e2simplexmlresult");
                         foreach (XmlNode xmlNode in e2simplexmlresult)
                         {
-                            var recordingInfo = new RecordingInfo();
+                            var recordingInfo = new MyRecordingInfo();
 
                             var e2state = "?";
                             var e2statetext = "?";
@@ -1314,7 +1317,7 @@ public async Task<IEnumerable<ProgramInfo>> GetProgramsAsync(string channelId, D
             var url = string.Format("{0}/web/epgservice?sRef={1}", baseUrl, channelId);
             UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] GetProgramsAsync url: {0}", url));
 
-            using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
+            using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))
             {
                 using (var reader = new StreamReader(stream))
                 {
@@ -1476,7 +1479,7 @@ public async Task<IEnumerable<ProgramInfo>> GetProgramsAsync(string channelId, D
         /// </summary>
         /// <param name="cancellationToken">The CancellationToken</param>
         /// <returns>LiveTvServiceStatusInfo</returns>
-        public async Task<LiveTvServiceStatusInfo> GetStatusInfoAsync(CancellationToken cancellationToken)
+        /*public async Task<LiveTvServiceStatusInfo> GetStatusInfoAsync(CancellationToken cancellationToken)
         {
             _logger.LogInformation("[Enigma2] Start GetStatusInfoAsync Async, retrieve status details");
             await EnsureConnectionAsync(cancellationToken).ConfigureAwait(false);
@@ -1555,7 +1558,7 @@ public async Task<LiveTvServiceStatusInfo> GetStatusInfoAsync(CancellationToken
 
                 }
             }
-        }
+        }*/
 
 
         /// <summary>
@@ -1581,8 +1584,12 @@ public async Task<MediaSourceInfo> GetRecordingStream(string recordingId, string
 
         public async Task CloseLiveStream(string id, CancellationToken cancellationToken)
         {
-            await Task.Delay(0); //to avoid await warnings
-            throw new NotImplementedException();
+            await Task.Factory.StartNew<string>(() =>
+            {
+                _logger.LogDebug("[Enigma2] LiveTvService.CloseLiveStream: closed stream for subscriptionId: {id}", id);
+                return id;
+            });
+
         }
 
 
@@ -1676,21 +1683,21 @@ public Task ResetTuner(string id, CancellationToken cancellationToken)
         }
 
 
-        public Task<ImageStream> GetChannelImageAsync(string channelId, CancellationToken cancellationToken)
+        public Task<Stream> GetChannelImageAsync(string channelId, CancellationToken cancellationToken)
         {
             // Leave as is. This is handled by supplying image url to ChannelInfo
             throw new NotImplementedException();
         }
 
 
-        public Task<ImageStream> GetProgramImageAsync(string programId, string channelId, CancellationToken cancellationToken)
+        public Task<Stream> GetProgramImageAsync(string programId, string channelId, CancellationToken cancellationToken)
         {
             // Leave as is. This is handled by supplying image url to ProgramInfo
             throw new NotImplementedException();
         }
 
 
-        public Task<ImageStream> GetRecordingImageAsync(string recordingId, CancellationToken cancellationToken)
+        public Task<Stream> GetRecordingImageAsync(string recordingId, CancellationToken cancellationToken)
         {
             // Leave as is. This is handled by supplying image url to RecordingInfo
             throw new NotImplementedException();
diff --git a/Jellyfin.Plugin.Enigma2/RecordingsChannel.cs b/Jellyfin.Plugin.Enigma2/RecordingsChannel.cs
@@ -7,23 +7,24 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Model.MediaInfo;
+using Microsoft.Extensions.Logging;
 
 namespace Jellyfin.Plugin.Enigma2
 {
     public class RecordingsChannel : IChannel, IHasCacheKey, ISupportsDelete, ISupportsLatestMedia, ISupportsMediaProbe, IHasFolderAttributes
     {
-        public ILiveTvManager _liveTvManager;
+        private readonly ILogger<LiveTvService> _logger;
 
-        public RecordingsChannel(ILiveTvManager liveTvManager)
+        public RecordingsChannel(ILoggerFactory loggerFactory)
         {
-            _liveTvManager = liveTvManager;
+            _logger = loggerFactory.CreateLogger<LiveTvService>();
+            _logger.LogDebug("[Enigma2] RecordingsChannel()");
         }
 
         public string Name => "Enigma2 Recordings";
@@ -110,7 +111,7 @@ public bool IsEnabledFor(string userId)
 
         private LiveTvService GetService()
         {
-            return _liveTvManager.Services.OfType<LiveTvService>().First();
+            return LiveTvService.Instance;
         }
 
         public bool CanDelete(BaseItem item)
diff --git a/Jellyfin.Plugin.Enigma2/ServiceRegistrator.cs b/Jellyfin.Plugin.Enigma2/ServiceRegistrator.cs
@@ -0,0 +1,20 @@
+using MediaBrowser.Controller.Channels;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Controller;
+using Microsoft.Extensions.DependencyInjection;
+using System.Net.Http;
+using Jellyfin.Plugin.Enigma2.Helpers;
+
+namespace Jellyfin.Plugin.Enigma2
+{
+    public class ServiceRegistrator : IPluginServiceRegistrator
+    {
+        /// <inheritdoc />
+        public void RegisterServices(IServiceCollection serviceCollection, IServerApplicationHost applicationHost)
+        {
+            serviceCollection.AddSingleton<ILiveTvService, LiveTvService>();
+            serviceCollection.AddSingleton<IChannel, RecordingsChannel>();
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,15 @@ public class LiveTvService : ILiveTvService`
`35`	`35`
`36`	`36`	`public DateTime LastRecordingChange = DateTime.MinValue;`
`37`	`37`
`38`		`- private readonly HttpClient _httpClient;`
	`38`	`+ private IHttpClientFactory _httpClientFactory;`
	`39`	`+`
	`40`	`+ public static LiveTvService Instance { get; private set; }`
`39`	`41`
`40`	`42`	`public LiveTvService(ILogger<LiveTvService> logger, IHttpClientFactory httpClientFactory)`
`41`	`43`	`{`
`42`	`44`	`_logger = logger;`
`43`		`- _httpClient = GetHttpClient(httpClientFactory);`
	`45`	`+ _httpClientFactory = httpClientFactory;`
	`46`	`+ Instance = this;`
`44`	`47`	`}`
`45`	`48`
`46`	`49`
`@@ -49,7 +52,7 @@ public LiveTvService(ILogger<LiveTvService> logger, IHttpClientFactory httpClien`
`49`	`52`	`/// </summary>`
`50`	`53`	`/// <param name="cancellationToken"></param>`
`51`	`54`	`/// <returns></returns>`
`52`		`- private async Task EnsureConnectionAsync(CancellationToken cancellationToken)`
	`55`	`+ public async Task EnsureConnectionAsync(CancellationToken cancellationToken)`
`53`	`56`	`{`
`54`	`57`	`_logger.LogInformation("[Enigma2] Start EnsureConnectionAsync");`
`55`	`58`
`@@ -151,9 +154,9 @@ private async Task EnsureConnectionAsync(CancellationToken cancellationToken)`
`151`	`154`	`/// </summary>`
`152`	`155`	`/// <param name="httpClientFactory"></param>`
`153`	`156`	`/// <returns></returns>`
`154`		`- private HttpClient GetHttpClient(IHttpClientFactory httpClientFactory)`
	`157`	`+ private HttpClient GetHttpClient()`
`155`	`158`	`{`
`156`		`- var httpClient = httpClientFactory.CreateClient(NamedClient.Default);`
	`159`	`+ var httpClient = _httpClientFactory.CreateClient(NamedClient.Default);`
`157`	`160`	`httpClient.DefaultRequestHeaders.UserAgent.Add(`
`158`	`161`	`new ProductInfoHeaderValue(Name, Plugin.Instance.Version.ToString()));`
`159`	`162`
`@@ -189,7 +192,7 @@ public async Task<string> InitiateSession(CancellationToken cancellationToken, s`
`189`	`192`	`var url = string.Format("{0}/web/getservices", baseUrl);`
`190`	`193`	`UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] InitiateSession url: {0}", url));`
`191`	`194`
`192`		`- using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
	`195`	`+ using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
`193`	`196`	`{`
`194`	`197`	`using (var reader = new StreamReader(stream))`
`195`	`198`	`{`
`@@ -290,7 +293,7 @@ public async Task<IEnumerable<ChannelInfo>> GetChannelsAsync(CancellationToken c`
`290`	`293`	`baseUrlPicon = protocol + "://" + Plugin.Instance.Configuration.WebInterfaceUsername + ":" + Plugin.Instance.Configuration.WebInterfacePassword + "@" + Plugin.Instance.Configuration.HostName + ":" + Plugin.Instance.Configuration.WebInterfacePort;`
`291`	`294`	`}`
`292`	`295`
`293`		`- using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
	`296`	`+ using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
`294`	`297`	`{`
`295`	`298`	`using (var reader = new StreamReader(stream))`
`296`	`299`	`{`
`@@ -454,7 +457,7 @@ public async Task<List<ChannelInfo>> GetChannelsForTVBouquetAsync(CancellationTo`
`454`	`457`	`baseUrlPicon = protocol + "://" + Plugin.Instance.Configuration.WebInterfaceUsername + ":" + Plugin.Instance.Configuration.WebInterfacePassword + "@" + Plugin.Instance.Configuration.HostName + ":" + Plugin.Instance.Configuration.WebInterfacePort;`
`455`	`458`	`}`
`456`	`459`
`457`		`- using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
	`460`	`+ using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
`458`	`461`	`{`
`459`	`462`	`using (var reader = new StreamReader(stream))`
`460`	`463`	`{`
`@@ -555,11 +558,11 @@ public async Task<List<ChannelInfo>> GetChannelsForTVBouquetAsync(CancellationTo`
`555`	`558`	`/// Gets the Recordings async`
`556`	`559`	`/// </summary>`
`557`	`560`	`/// <param name="cancellationToken">The cancellation token.</param>`
`558`		`- /// <returns>Task{IEnumerable{RecordingInfo}}</returns>`
`559`		`- public async Task<IEnumerable<RecordingInfo>> GetRecordingsAsync(CancellationToken cancellationToken)`
	`561`	`+ /// <returns>Task{IEnumerable{MyRecordingInfo}}</returns>`
	`562`	`+ public async Task<IEnumerable<MyRecordingInfo>> GetRecordingsAsync(CancellationToken cancellationToken)`
`560`	`563`	`{`
`561`	`564`	`await Task.Delay(0); //to avoid await warnings`
`562`		`- return new List<RecordingInfo>();`
	`565`	`+ return new List<MyRecordingInfo>();`
`563`	`566`	`}`
`564`	`567`
`565`	`568`	`public async Task<IEnumerable<MyRecordingInfo>> GetAllRecordingsAsync(CancellationToken cancellationToken)`
`@@ -578,7 +581,7 @@ public async Task<IEnumerable<MyRecordingInfo>> GetAllRecordingsAsync(Cancellati`
`578`	`581`	`var url = string.Format("{0}/web/movielist", baseUrl);`
`579`	`582`	`UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] GetRecordingsAsync url: {0}", url));`
`580`	`583`
`581`		`- using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
	`584`	`+ using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
`582`	`585`	`{`
`583`	`586`	`using (var reader = new StreamReader(stream))`
`584`	`587`	`{`
`@@ -757,7 +760,7 @@ public async Task DeleteRecordingAsync(string recordingId, CancellationToken can`
`757`	`760`	`var url = string.Format("{0}/web/moviedelete?sRef={1}", baseUrl, recordingId);`
`758`	`761`	`UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] DeleteRecordingAsync url: {0}", url));`
`759`	`762`
`760`		`- using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
	`763`	`+ using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
`761`	`764`	`{`
`762`	`765`	`using (var reader = new StreamReader(stream))`
`763`	`766`	`{`
`@@ -772,7 +775,7 @@ public async Task DeleteRecordingAsync(string recordingId, CancellationToken can`
`772`	`775`	`var e2simplexmlresult = xml.GetElementsByTagName("e2simplexmlresult");`
`773`	`776`	`foreach (XmlNode xmlNode in e2simplexmlresult)`
`774`	`777`	`{`
`775`		`- var recordingInfo = new RecordingInfo();`
	`778`	`+ var recordingInfo = new MyRecordingInfo();`
`776`	`779`
`777`	`780`	`var e2state = "?";`
`778`	`781`	`var e2statetext = "?";`
`@@ -837,7 +840,7 @@ public async Task CancelTimerAsync(string timerId, CancellationToken cancellatio`
`837`	`840`	`var url = string.Format("{0}/web/timerdelete?sRef={1}&begin={2}&end={3}", baseUrl, sRef, begin, end);`
`838`	`841`	`UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] CancelTimerAsync url: {0}", url));`
`839`	`842`
`840`		`- using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
	`843`	`+ using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
`841`	`844`	`{`
`842`	`845`	`using (var reader = new StreamReader(stream))`
`843`	`846`	`{`
`@@ -852,7 +855,7 @@ public async Task CancelTimerAsync(string timerId, CancellationToken cancellatio`
`852`	`855`	`var e2simplexmlresult = xml.GetElementsByTagName("e2simplexmlresult");`
`853`	`856`	`foreach (XmlNode xmlNode in e2simplexmlresult)`
`854`	`857`	`{`
`855`		`- var recordingInfo = new RecordingInfo();`
	`858`	`+ var recordingInfo = new MyRecordingInfo();`
`856`	`859`
`857`	`860`	`var e2state = "?";`
`858`	`861`	`var e2statetext = "?";`
`@@ -920,7 +923,7 @@ public async Task CreateTimerAsync(TimerInfo info, CancellationToken cancellatio`
`920`	`923`
`921`	`924`	`UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] CreateTimerAsync url: {0}", url));`
`922`	`925`
`923`		`- using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
	`926`	`+ using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
`924`	`927`	`{`
`925`	`928`	`using (var reader = new StreamReader(stream))`
`926`	`929`	`{`
`@@ -935,7 +938,7 @@ public async Task CreateTimerAsync(TimerInfo info, CancellationToken cancellatio`
`935`	`938`	`var e2simplexmlresult = xml.GetElementsByTagName("e2simplexmlresult");`
`936`	`939`	`foreach (XmlNode xmlNode in e2simplexmlresult)`
`937`	`940`	`{`
`938`		`- var recordingInfo = new RecordingInfo();`
	`941`	`+ var recordingInfo = new MyRecordingInfo();`
`939`	`942`
`940`	`943`	`var e2state = "?";`
`941`	`944`	`var e2statetext = "?";`
`@@ -992,7 +995,7 @@ public async Task<IEnumerable<TimerInfo>> GetTimersAsync(CancellationToken cance`
`992`	`995`	`var url = string.Format("{0}/web/timerlist", baseUrl);`
`993`	`996`	`UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] GetTimersAsync url: {0}", url));`
`994`	`997`
`995`		`- using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
	`998`	`+ using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
`996`	`999`	`{`
`997`	`1000`	`using (var reader = new StreamReader(stream))`
`998`	`1001`	`{`
`@@ -1215,7 +1218,7 @@ public async Task ZapToChannel(CancellationToken cancellationToken, string chann`
`1215`	`1218`	`var url = string.Format("{0}/web/zap?sRef={1}", baseUrl, channelOid);`
`1216`	`1219`	`UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] ZapToChannel url: {0}", url));`
`1217`	`1220`
`1218`		`- using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
	`1221`	`+ using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
`1219`	`1222`	`{`
`1220`	`1223`	`using (var reader = new StreamReader(stream))`
`1221`	`1224`	`{`
`@@ -1230,7 +1233,7 @@ public async Task ZapToChannel(CancellationToken cancellationToken, string chann`
`1230`	`1233`	`var e2simplexmlresult = xml.GetElementsByTagName("e2simplexmlresult");`
`1231`	`1234`	`foreach (XmlNode xmlNode in e2simplexmlresult)`
`1232`	`1235`	`{`
`1233`		`- var recordingInfo = new RecordingInfo();`
	`1236`	`+ var recordingInfo = new MyRecordingInfo();`
`1234`	`1237`
`1235`	`1238`	`var e2state = "?";`
`1236`	`1239`	`var e2statetext = "?";`
`@@ -1314,7 +1317,7 @@ public async Task<IEnumerable<ProgramInfo>> GetProgramsAsync(string channelId, D`
`1314`	`1317`	`var url = string.Format("{0}/web/epgservice?sRef={1}", baseUrl, channelId);`
`1315`	`1318`	`UtilsHelper.DebugInformation(_logger, string.Format("[Enigma2] GetProgramsAsync url: {0}", url));`
`1316`	`1319`
`1317`		`- using (var stream = await _httpClient.GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
	`1320`	`+ using (var stream = await GetHttpClient().GetStreamAsync(url, cancellationToken).ConfigureAwait(false))`
`1318`	`1321`	`{`
`1319`	`1322`	`using (var reader = new StreamReader(stream))`
`1320`	`1323`	`{`
`@@ -1476,7 +1479,7 @@ public async Task<IEnumerable<ProgramInfo>> GetProgramsAsync(string channelId, D`
`1476`	`1479`	`/// </summary>`
`1477`	`1480`	`/// <param name="cancellationToken">The CancellationToken</param>`
`1478`	`1481`	`/// <returns>LiveTvServiceStatusInfo</returns>`
`1479`		`- public async Task<LiveTvServiceStatusInfo> GetStatusInfoAsync(CancellationToken cancellationToken)`
	`1482`	`+ /*public async Task<LiveTvServiceStatusInfo> GetStatusInfoAsync(CancellationToken cancellationToken)`
`1480`	`1483`	`{`
`1481`	`1484`	`_logger.LogInformation("[Enigma2] Start GetStatusInfoAsync Async, retrieve status details");`
`1482`	`1485`	`await EnsureConnectionAsync(cancellationToken).ConfigureAwait(false);`
`@@ -1555,7 +1558,7 @@ public async Task<LiveTvServiceStatusInfo> GetStatusInfoAsync(CancellationToken`
`1555`	`1558`
`1556`	`1559`	`}`
`1557`	`1560`	`}`
`1558`		`- }`
	`1561`	`+ }*/`
`1559`	`1562`
`1560`	`1563`
`1561`	`1564`	`/// <summary>`
`@@ -1581,8 +1584,12 @@ public async Task<MediaSourceInfo> GetRecordingStream(string recordingId, string`
`1581`	`1584`
`1582`	`1585`	`public async Task CloseLiveStream(string id, CancellationToken cancellationToken)`
`1583`	`1586`	`{`
`1584`		`- await Task.Delay(0); //to avoid await warnings`
`1585`		`- throw new NotImplementedException();`
	`1587`	`+ await Task.Factory.StartNew<string>(() =>`
	`1588`	`+ {`
	`1589`	`+ _logger.LogDebug("[Enigma2] LiveTvService.CloseLiveStream: closed stream for subscriptionId: {id}", id);`
	`1590`	`+ return id;`
	`1591`	`+ });`
	`1592`	`+`
`1586`	`1593`	`}`
`1587`	`1594`
`1588`	`1595`
`@@ -1676,21 +1683,21 @@ public Task ResetTuner(string id, CancellationToken cancellationToken)`
`1676`	`1683`	`}`
`1677`	`1684`
`1678`	`1685`
`1679`		`- public Task<ImageStream> GetChannelImageAsync(string channelId, CancellationToken cancellationToken)`
	`1686`	`+ public Task<Stream> GetChannelImageAsync(string channelId, CancellationToken cancellationToken)`
`1680`	`1687`	`{`
`1681`	`1688`	`// Leave as is. This is handled by supplying image url to ChannelInfo`
`1682`	`1689`	`throw new NotImplementedException();`
`1683`	`1690`	`}`
`1684`	`1691`
`1685`	`1692`
`1686`		`- public Task<ImageStream> GetProgramImageAsync(string programId, string channelId, CancellationToken cancellationToken)`
	`1693`	`+ public Task<Stream> GetProgramImageAsync(string programId, string channelId, CancellationToken cancellationToken)`
`1687`	`1694`	`{`
`1688`	`1695`	`// Leave as is. This is handled by supplying image url to ProgramInfo`
`1689`	`1696`	`throw new NotImplementedException();`
`1690`	`1697`	`}`
`1691`	`1698`
`1692`	`1699`
`1693`		`- public Task<ImageStream> GetRecordingImageAsync(string recordingId, CancellationToken cancellationToken)`
	`1700`	`+ public Task<Stream> GetRecordingImageAsync(string recordingId, CancellationToken cancellationToken)`
`1694`	`1701`	`{`
`1695`	`1702`	`// Leave as is. This is handled by supplying image url to RecordingInfo`
`1696`	`1703`	`throw new NotImplementedException();`
Original file line number	Diff line number	Diff line change
`@@ -7,23 +7,24 @@`
`7`	`7`	`using MediaBrowser.Common.Extensions;`
`8`	`8`	`using MediaBrowser.Controller.Channels;`
`9`	`9`	`using MediaBrowser.Controller.Entities;`
`10`		`-using MediaBrowser.Controller.LiveTv;`
`11`	`10`	`using MediaBrowser.Controller.Providers;`
`12`	`11`	`using MediaBrowser.Model.Channels;`
`13`	`12`	`using MediaBrowser.Model.Dto;`
`14`	`13`	`using MediaBrowser.Model.Entities;`
`15`	`14`	`using MediaBrowser.Model.LiveTv;`
`16`	`15`	`using MediaBrowser.Model.MediaInfo;`
	`16`	`+using Microsoft.Extensions.Logging;`
`17`	`17`
`18`	`18`	`namespace Jellyfin.Plugin.Enigma2`
`19`	`19`	`{`
`20`	`20`	`public class RecordingsChannel : IChannel, IHasCacheKey, ISupportsDelete, ISupportsLatestMedia, ISupportsMediaProbe, IHasFolderAttributes`
`21`	`21`	`{`
`22`		`- public ILiveTvManager _liveTvManager;`
	`22`	`+ private readonly ILogger<LiveTvService> _logger;`
`23`	`23`
`24`		`- public RecordingsChannel(ILiveTvManager liveTvManager)`
	`24`	`+ public RecordingsChannel(ILoggerFactory loggerFactory)`
`25`	`25`	`{`
`26`		`- _liveTvManager = liveTvManager;`
	`26`	`+ _logger = loggerFactory.CreateLogger<LiveTvService>();`
	`27`	`+ _logger.LogDebug("[Enigma2] RecordingsChannel()");`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`public string Name => "Enigma2 Recordings";`
`@@ -110,7 +111,7 @@ public bool IsEnabledFor(string userId)`
`110`	`111`
`111`	`112`	`private LiveTvService GetService()`
`112`	`113`	`{`
`113`		`- return _liveTvManager.Services.OfType<LiveTvService>().First();`
	`114`	`+ return LiveTvService.Instance;`
`114`	`115`	`}`
`115`	`116`
`116`	`117`	`public bool CanDelete(BaseItem item)`