lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1373 from MediaBrowser/master

Browse Source 
add tuner error handling
This commit is contained in:
Luke 2015-12-28 13:42:42 -05:00
commit 0b3ec059c3
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
View File

@ -107,11 +107,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
foreach (var host in hosts) foreach (var host in hosts)
{ {
var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false); try
if (channels.Any(i => string.Equals(i.Id, channelId, StringComparison.OrdinalIgnoreCase)))
{ {
hostsWithChannel.Add(host); var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false);
if (channels.Any(i => string.Equals(i.Id, channelId, StringComparison.OrdinalIgnoreCase)))
{
hostsWithChannel.Add(host);
}
}
catch (Exception ex)
{
Logger.Error("Error getting channels", ex);
} }
} }
@ -172,11 +179,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
{ {
if (string.IsNullOrWhiteSpace(streamId)) if (string.IsNullOrWhiteSpace(streamId))
{ {
var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false); try
if (channels.Any(i => string.Equals(i.Id, channelId, StringComparison.OrdinalIgnoreCase)))
{ {
hostsWithChannel.Add(host); var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false);
if (channels.Any(i => string.Equals(i.Id, channelId, StringComparison.OrdinalIgnoreCase)))
{
hostsWithChannel.Add(host);
}
}
catch (Exception ex)
{
Logger.Error("Error getting channels", ex);
} }
} }
else if (streamId.StartsWith(host.Id, StringComparison.OrdinalIgnoreCase)) else if (streamId.StartsWith(host.Id, StringComparison.OrdinalIgnoreCase))