consolidate

This commit is contained in:
Luke Pulverenti 2017-09-08 01:39:55 -04:00
parent 6392f5e141
commit 33e31d246f

View File

@ -318,7 +318,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
channels = (await GetChannelsAsync(true, CancellationToken.None).ConfigureAwait(false)).ToList(); channels = (await GetChannelsAsync(true, CancellationToken.None).ConfigureAwait(false)).ToList();
} }
var channelIds = channels.Select(i => i.Id).ToList(); var channelIds = channels.Select(i => i.Id).ToList();
epgData = GetEpgDataForChannels(channelIds); epgData = channelIds.SelectMany(GetEpgDataForChannel).ToList();
} }
else else
{ {
@ -703,7 +703,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
{ {
var channels = await GetChannelsAsync(true, CancellationToken.None).ConfigureAwait(false); var channels = await GetChannelsAsync(true, CancellationToken.None).ConfigureAwait(false);
var channelIds = channels.Select(i => i.Id).ToList(); var channelIds = channels.Select(i => i.Id).ToList();
epgData = GetEpgDataForChannels(channelIds); epgData = channelIds.SelectMany(GetEpgDataForChannel).ToList();
} }
else else
{ {
@ -784,7 +784,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
{ {
var channels = await GetChannelsAsync(true, CancellationToken.None).ConfigureAwait(false); var channels = await GetChannelsAsync(true, CancellationToken.None).ConfigureAwait(false);
var channelIds = channels.Select(i => i.Id).ToList(); var channelIds = channels.Select(i => i.Id).ToList();
epgData = GetEpgDataForChannels(channelIds); epgData = channelIds.SelectMany(GetEpgDataForChannel).ToList();
} }
else else
{ {
@ -2617,10 +2617,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
return new List<ProgramInfo>(); return new List<ProgramInfo>();
} }
} }
private List<ProgramInfo> GetEpgDataForChannels(List<string> channelIds)
{
return channelIds.SelectMany(GetEpgDataForChannel).ToList();
}
private bool _disposed; private bool _disposed;
public void Dispose() public void Dispose()