diff options
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs | 125 |
1 files changed, 98 insertions, 27 deletions
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs index 8784d5753..64cbc4f86 100644 --- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs +++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs @@ -57,12 +57,13 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts return Task.FromResult(_fileSystem.OpenRead(url)); } + const string ExtInfPrefix = "#EXTINF:"; private List<M3UChannel> GetChannels(StreamReader reader, string urlHash, string channelIdPrefix, string tunerHostId) { var channels = new List<M3UChannel>(); string line; string extInf = ""; - while ((line = reader.ReadLine()) != null) + while ((line = reader.ReadLine()) != null) { line = line.Trim(); if (string.IsNullOrWhiteSpace(line)) @@ -75,9 +76,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts continue; } - if (line.StartsWith("#EXTINF:", StringComparison.OrdinalIgnoreCase)) + if (line.StartsWith(ExtInfPrefix, StringComparison.OrdinalIgnoreCase)) { - extInf = line.Substring(8).Trim(); + extInf = line.Substring(ExtInfPrefix.Length).Trim(); _logger.Info("Found m3u channel: {0}", extInf); } else if (!string.IsNullOrWhiteSpace(extInf) && !line.StartsWith("#", StringComparison.OrdinalIgnoreCase)) @@ -91,61 +92,131 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts } return channels; } + private M3UChannel GetChannelnfo(string extInf, string tunerHostId, string mediaUrl) { - var titleIndex = extInf.LastIndexOf(','); var channel = new M3UChannel(); channel.TunerHostId = tunerHostId; - channel.Number = extInf.Trim().Split(' ')[0] ?? "0"; - channel.Name = extInf.Substring(titleIndex + 1); + extInf = extInf.Trim(); //Check for channel number with the format from SatIp - int number; - var numberIndex = channel.Name.IndexOf('.'); - if (numberIndex > 0) + //int number; + //var numberIndex = channel.Name.IndexOf('.'); + //if (numberIndex > 0) + //{ + // if (int.TryParse(channel.Name.Substring(0, numberIndex), out number)) + // { + // channel.Number = number.ToString(); + // channel.Name = channel.Name.Substring(numberIndex + 1); + // } + //} + + channel.ImageUrl = FindProperty("tvg-logo", extInf); + + channel.Name = GetChannelName(extInf); + + channel.Number = GetChannelNumber(extInf, mediaUrl); + + return channel; + } + + private string GetChannelNumber(string extInf, string mediaUrl) + { + var nameParts = extInf.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + var nameInExtInf = nameParts.Length > 1 ? nameParts.Last().Trim() : null; + + var numberString = nameParts[0]; + + //Check for channel number with the format from SatIp + int number; + if (!string.IsNullOrWhiteSpace(nameInExtInf)) { - if (int.TryParse(channel.Name.Substring(0, numberIndex), out number)) + var numberIndex = nameInExtInf.IndexOf('.'); + if (numberIndex > 0) { - channel.Number = number.ToString(); - channel.Name = channel.Name.Substring(numberIndex + 1); + if (int.TryParse(nameInExtInf.Substring(0, numberIndex), out number)) + { + numberString = number.ToString(); + } } } - if (string.Equals(channel.Number, "-1", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrWhiteSpace(mediaUrl)) + if (string.IsNullOrWhiteSpace(numberString) || + string.Equals(numberString, "-1", StringComparison.OrdinalIgnoreCase) || + string.Equals(numberString, "0", StringComparison.OrdinalIgnoreCase)) { - channel.Number = Path.GetFileNameWithoutExtension(mediaUrl.Split('/').Last()); + numberString = FindProperty("tvg-id", extInf); } - if (string.Equals(channel.Number, "-1", StringComparison.OrdinalIgnoreCase)) + if (string.IsNullOrWhiteSpace(numberString) || + string.Equals(numberString, "-1", StringComparison.OrdinalIgnoreCase) || + string.Equals(numberString, "0", StringComparison.OrdinalIgnoreCase)) { - channel.Number = "0"; + numberString = FindProperty("channel-id", extInf); } - channel.ImageUrl = FindProperty("tvg-logo", extInf); + if (string.IsNullOrWhiteSpace(numberString) || + string.Equals(numberString, "-1", StringComparison.OrdinalIgnoreCase) || + string.Equals(numberString, "0", StringComparison.OrdinalIgnoreCase)) + { + numberString = null; + } - var name = FindProperty("tvg-name", extInf); - if (string.IsNullOrWhiteSpace(name)) + if (string.IsNullOrWhiteSpace(numberString)) { - name = FindProperty("tvg-id", extInf); + if (string.IsNullOrWhiteSpace(mediaUrl)) + { + numberString = null; + } + else + { + numberString = Path.GetFileNameWithoutExtension(mediaUrl.Split('/').Last()); + } } - channel.Name = name; + return numberString; + } - var numberString = FindProperty("tvg-id", extInf); - if (string.IsNullOrWhiteSpace(numberString)) + private string GetChannelName(string extInf) + { + var nameParts = extInf.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + var nameInExtInf = nameParts.Length > 1 ? nameParts.Last().Trim() : null; + + //Check for channel number with the format from SatIp + int number; + if (!string.IsNullOrWhiteSpace(nameInExtInf)) { - numberString = FindProperty("channel-id", extInf); + var numberIndex = nameInExtInf.IndexOf('.'); + if (numberIndex > 0) + { + if (int.TryParse(nameInExtInf.Substring(0, numberIndex), out number)) + { + //channel.Number = number.ToString(); + nameInExtInf = nameInExtInf.Substring(numberIndex + 1); + } + } + } + + var name = FindProperty("tvg-name", extInf); + if (string.IsNullOrWhiteSpace(name)) + { + name = nameInExtInf; } - if (!string.IsNullOrWhiteSpace(numberString)) + if (string.IsNullOrWhiteSpace(name)) { - channel.Number = numberString; + name = FindProperty("tvg-id", extInf); } - return channel; + if (string.IsNullOrWhiteSpace(name)) + { + name = null; + } + return name; } + private string FindProperty(string property, string properties) { var reg = new Regex(@"([a-z0-9\-_]+)=\""([^""]+)\""", RegexOptions.IgnoreCase); |