Merge pull request #6667 from Bond-009/warn53

7 files changed, 140 insertions, 122 deletions

diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ImageDataDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ImageDataDto.cs
index 912e680dd..4e9efc60f 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ImageDataDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ImageDataDto.cs
@@ -37,7 +37,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the aspect.
         /// </summary>
         [JsonPropertyName("aspect")]
-        public string aspect { get; set; }
+        public string Aspect { get; set; }
 
         /// <summary>
         /// Gets or sets the category.
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/StationDto.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/StationDto.cs
index 12f3576c6..c37f19678 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/StationDto.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/StationDto.cs
@@ -6,62 +6,62 @@ using System.Text.Json.Serialization;
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 {
     /// <summary>
-            /// Station dto.
-            /// </summary>
-            public class StationDto
-            {
-                /// <summary>
-                /// Gets or sets the station id.
-                /// </summary>
-                [JsonPropertyName("stationID")]
-                public string StationId { get; set; }
+    /// Station dto.
+    /// </summary>
+    public class StationDto
+    {
+        /// <summary>
+        /// Gets or sets the station id.
+        /// </summary>
+        [JsonPropertyName("stationID")]
+        public string StationId { get; set; }
 
-                /// <summary>
-                /// Gets or sets the name.
-                /// </summary>
-                [JsonPropertyName("name")]
-                public string Name { get; set; }
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
 
-                /// <summary>
-                /// Gets or sets the callsign.
-                /// </summary>
-                [JsonPropertyName("callsign")]
-                public string Callsign { get; set; }
+        /// <summary>
+        /// Gets or sets the callsign.
+        /// </summary>
+        [JsonPropertyName("callsign")]
+        public string Callsign { get; set; }
 
-                /// <summary>
-                /// Gets or sets the broadcast language.
-                /// </summary>
-                [JsonPropertyName("broadcastLanguage")]
-                public List<string> BroadcastLanguage { get; set; }
+        /// <summary>
+        /// Gets or sets the broadcast language.
+        /// </summary>
+        [JsonPropertyName("broadcastLanguage")]
+        public List<string> BroadcastLanguage { get; set; }
 
-                /// <summary>
-                /// Gets or sets the description language.
-                /// </summary>
-                [JsonPropertyName("descriptionLanguage")]
-                public List<string> DescriptionLanguage { get; set; }
+        /// <summary>
+        /// Gets or sets the description language.
+        /// </summary>
+        [JsonPropertyName("descriptionLanguage")]
+        public List<string> DescriptionLanguage { get; set; }
 
-                /// <summary>
-                /// Gets or sets the broadcaster.
-                /// </summary>
-                [JsonPropertyName("broadcaster")]
-                public BroadcasterDto Broadcaster { get; set; }
+        /// <summary>
+        /// Gets or sets the broadcaster.
+        /// </summary>
+        [JsonPropertyName("broadcaster")]
+        public BroadcasterDto Broadcaster { get; set; }
 
-                /// <summary>
-                /// Gets or sets the affiliate.
-                /// </summary>
-                [JsonPropertyName("affiliate")]
-                public string Affiliate { get; set; }
+        /// <summary>
+        /// Gets or sets the affiliate.
+        /// </summary>
+        [JsonPropertyName("affiliate")]
+        public string Affiliate { get; set; }
 
-                /// <summary>
-                /// Gets or sets the logo.
-                /// </summary>
-                [JsonPropertyName("logo")]
-                public LogoDto Logo { get; set; }
+        /// <summary>
+        /// Gets or sets the logo.
+        /// </summary>
+        [JsonPropertyName("logo")]
+        public LogoDto Logo { get; set; }
 
-                /// <summary>
-                /// Gets or set a value indicating whether it is commercial free.
-                /// </summary>
-                [JsonPropertyName("isCommercialFree")]
-                public bool? IsCommercialFree { get; set; }
-            }
+        /// <summary>
+        /// Gets or sets a value indicating whether it is commercial free.
+        /// </summary>
+        [JsonPropertyName("isCommercialFree")]
+        public bool? IsCommercialFree { get; set; }
+    }
 }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunChannelCommands.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunChannelCommands.cs
new file mode 100644
index 000000000..069b4fab6
--- /dev/null
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunChannelCommands.cs
@@ -0,0 +1,35 @@
+#pragma warning disable CS1591
+
+using System;
+using System.Collections.Generic;
+
+namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
+{
+    public class HdHomerunChannelCommands : IHdHomerunChannelCommands
+    {
+        private string? _channel;
+        private string? _profile;
+
+        public HdHomerunChannelCommands(string? channel, string? profile)
+        {
+            _channel = channel;
+            _profile = profile;
+        }
+
+        public IEnumerable<(string, string)> GetCommands()
+        {
+            if (!string.IsNullOrEmpty(_channel))
+            {
+                if (!string.IsNullOrEmpty(_profile)
+                    && !string.Equals(_profile, "native", StringComparison.OrdinalIgnoreCase))
+                {
+                    yield return ("vchannel", $"{_channel} transcode={_profile}");
+                }
+                else
+                {
+                    yield return ("vchannel", _channel);
+                }
+            }
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index 4d538c604..78ea7bd0f 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -87,11 +87,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             return lineup.Where(i => !i.DRM).ToList();
         }
 
-        private class HdHomerunChannelInfo : ChannelInfo
-        {
-            public bool IsLegacyTuner { get; set; }
-        }
-
         protected override async Task<List<ChannelInfo>> GetChannelsInternal(TunerHostInfo tuner, CancellationToken cancellationToken)
         {
             var lineup = await GetLineup(tuner, cancellationToken).ConfigureAwait(false);
@@ -715,5 +710,10 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
             return hostInfo;
         }
+
+        private class HdHomerunChannelInfo : ChannelInfo
+        {
+            public bool IsLegacyTuner { get; set; }
+        }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
index b2e555c7d..f0f61297f 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
@@ -5,12 +5,10 @@
 using System;
 using System.Buffers;
 using System.Buffers.Binary;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common;
@@ -18,70 +16,6 @@ using MediaBrowser.Controller.LiveTv;
 
 namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 {
-    public interface IHdHomerunChannelCommands
-    {
-        IEnumerable<(string, string)> GetCommands();
-    }
-
-    public class LegacyHdHomerunChannelCommands : IHdHomerunChannelCommands
-    {
-        private string _channel;
-        private string _program;
-
-        public LegacyHdHomerunChannelCommands(string url)
-        {
-            // parse url for channel and program
-            var regExp = new Regex(@"\/ch([0-9]+)-?([0-9]*)");
-            var match = regExp.Match(url);
-            if (match.Success)
-            {
-                _channel = match.Groups[1].Value;
-                _program = match.Groups[2].Value;
-            }
-        }
-
-        public IEnumerable<(string, string)> GetCommands()
-        {
-            if (!string.IsNullOrEmpty(_channel))
-            {
-                yield return ("channel", _channel);
-            }
-
-            if (!string.IsNullOrEmpty(_program))
-            {
-                yield return ("program", _program);
-            }
-        }
-    }
-
-    public class HdHomerunChannelCommands : IHdHomerunChannelCommands
-    {
-        private string _channel;
-        private string _profile;
-
-        public HdHomerunChannelCommands(string channel, string profile)
-        {
-            _channel = channel;
-            _profile = profile;
-        }
-
-        public IEnumerable<(string, string)> GetCommands()
-        {
-            if (!string.IsNullOrEmpty(_channel))
-            {
-                if (!string.IsNullOrEmpty(_profile)
-                    && !string.Equals(_profile, "native", StringComparison.OrdinalIgnoreCase))
-                {
-                    yield return ("vchannel", $"{_channel} transcode={_profile}");
-                }
-                else
-                {
-                    yield return ("vchannel", _channel);
-                }
-            }
-        }
-    }
-
     public sealed class HdHomerunManager : IDisposable
     {
         public const int HdHomeRunPort = 65001;
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/IHdHomerunChannelCommands.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/IHdHomerunChannelCommands.cs
new file mode 100644
index 000000000..153354932
--- /dev/null
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/IHdHomerunChannelCommands.cs
@@ -0,0 +1,11 @@
+#pragma warning disable CS1591
+
+using System.Collections.Generic;
+
+namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
+{
+    public interface IHdHomerunChannelCommands
+    {
+        IEnumerable<(string, string)> GetCommands();
+    }
+}
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/LegacyHdHomerunChannelCommands.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/LegacyHdHomerunChannelCommands.cs
new file mode 100644
index 000000000..26627b8aa
--- /dev/null
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/LegacyHdHomerunChannelCommands.cs
@@ -0,0 +1,38 @@
+#pragma warning disable CS1591
+
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
+{
+    public class LegacyHdHomerunChannelCommands : IHdHomerunChannelCommands
+    {
+        private string? _channel;
+        private string? _program;
+
+        public LegacyHdHomerunChannelCommands(string url)
+        {
+            // parse url for channel and program
+            var regExp = new Regex(@"\/ch([0-9]+)-?([0-9]*)");
+            var match = regExp.Match(url);
+            if (match.Success)
+            {
+                _channel = match.Groups[1].Value;
+                _program = match.Groups[2].Value;
+            }
+        }
+
+        public IEnumerable<(string, string)> GetCommands()
+        {
+            if (!string.IsNullOrEmpty(_channel))
+            {
+                yield return ("channel", _channel);
+            }
+
+            if (!string.IsNullOrEmpty(_program))
+            {
+                yield return ("program", _program);
+            }
+        }
+    }
+}