grab more sat fields

MediaBrowser.Controller/LiveTv/LiveTvTunerInfo.cs

@@ -59,6 +59,12 @@ namespace MediaBrowser.Controller.LiveTv
         /// <value>The clients.</value>
         public List<string> Clients { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance can reset.
+        /// </summary>
+        /// <value><c>true</c> if this instance can reset; otherwise, <c>false</c>.</value>
+        public bool CanReset { get; set; }
+
         public LiveTvTunerInfo()
         {
             Clients = new List<string>();

MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs

@@ -64,6 +64,12 @@ namespace MediaBrowser.Model.LiveTv
         /// <value>The clients.</value>
         public List<string> Clients { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance can reset.
+        /// </summary>
+        /// <value><c>true</c> if this instance can reset; otherwise, <c>false</c>.</value>
+        public bool CanReset { get; set; }
+        
         public LiveTvTunerInfoDto()
         {
             Clients = new List<string>();

MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs

@@ -178,7 +178,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 SourceType = info.SourceType,
                 Status = info.Status,
                 ChannelName = channelName,
-                Url = info.Url
+                Url = info.Url,
+                CanReset = info.CanReset
             };
 
             if (!string.IsNullOrEmpty(info.ChannelId))

MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -195,12 +196,31 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
                                 break;
                             }
 
+                        case "friendlyName":
+                            {
+                                info.FriendlyName = reader.ReadElementContentAsString();
+                                break;
+                            }
+
                         case "satip:X_SATIPCAP":
                         case "X_SATIPCAP":
                             {
                                 // <satip:X_SATIPCAP xmlns:satip="urn:ses-com:satip">DVBS2-2</satip:X_SATIPCAP>
-                                var value = reader.ReadElementContentAsString();
-                                // TODO
+                                var value = reader.ReadElementContentAsString() ?? string.Empty;
+                                var parts = value.Split(new[] { '-' }, StringSplitOptions.RemoveEmptyEntries);
+                                if (parts.Length == 2)
+                                {
+                                    int intValue;
+                                    if (int.TryParse(parts[1], NumberStyles.Any, CultureInfo.InvariantCulture, out intValue))
+                                    {
+                                        info.TunersAvailable = intValue;
+                                    }
+
+                                    if (int.TryParse(parts[0].Substring(parts[0].Length - 1), NumberStyles.Any, CultureInfo.InvariantCulture, out intValue))
+                                    {
+                                        info.Tuners = intValue;
+                                    }
+                                }
                                 break;
                             }
 
@@ -226,5 +246,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
         public int Tuners { get; set; }
         public int TunersAvailable { get; set; }
         public string M3UUrl { get; set; }
+        public string FriendlyName { get; set; }
     }
 }

MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpHost.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -140,17 +141,31 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
         public Task<List<LiveTvTunerInfo>> GetTunerInfos(CancellationToken cancellationToken)
         {
             var list = GetTunerHosts()
-            .Select(i => new LiveTvTunerInfo()
+            .SelectMany(i => GetTunerInfos(i, cancellationToken))
+            .ToList();
+
+            return Task.FromResult(list);
+        }
+
+        public List<LiveTvTunerInfo> GetTunerInfos(TunerHostInfo info, CancellationToken cancellationToken)
+        {
+            var satInfo = (SatIpTunerHostInfo) info;
+
+            var list = new List<LiveTvTunerInfo>();
+
+            for (var i = 0; i < satInfo.Tuners; i++)
+            {
+                list.Add(new LiveTvTunerInfo
                 {
-                Name = Name,
+                    Name = satInfo.FriendlyName ?? Name,
                     SourceType = Type,
                     Status = LiveTvTunerStatus.Available,
-                Id = i.Url.GetMD5().ToString("N"),
-                Url = i.Url
-            })
-            .ToList();
+                    Id = info.Url.GetMD5().ToString("N") + i.ToString(CultureInfo.InvariantCulture),
+                    Url = info.Url
+                });
+            }
 
-            return Task.FromResult(list);
+            return list;
         }
     }
 }