pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

if (string.IsNullOrWhiteSpace(result)) 

{
                attributes.TryGetValue("channel-id", out result);
            }
This commit is contained in:
Luke Pulverenti 2017-02-22 16:13:27 -05:00
parent 6847cac829
commit 34171a7507
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
View File

@ -298,15 +298,20 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
private string GetTunerChannelId(Dictionary<string, string> attributes)
{
string result;
attributes.TryGetValue("tvg-id", out result);
var values = new List<string>();
if (string.IsNullOrWhiteSpace(result))
string result;
if (attributes.TryGetValue("tvg-id", out result))
{
attributes.TryGetValue("channel-id", out result);
values.Add(result);
}
return result;
if (attributes.TryGetValue("channel-id", out result))
{
values.Add(result);
}
return values.Count == 0 ? null : string.Join("-", values.ToArray());
}
private Dictionary<string, string> ParseExtInf(string line, out string remaining)

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.1.114")]
[assembly: AssemblyVersion("3.2.1.115")]