starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 14:03:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

switch to subtitle filter

Browse Source
This commit is contained in:
Luke Pulverenti
2014-06-10 13:36:06 -04:00
parent 5d08aa39a9
commit 437062b29e
27 changed files with 213 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Server.Implementations/Library/UserViewManager.cs
View File

@@ -88,29 +88,19 @@ namespace MediaBrowser.Server.Implementations.Library
if (query.IncludeExternalContent)
{
var channelsTask = Task.Run(() => _channelManager.GetChannels(new ChannelQuery
var channelResult = await _channelManager.GetChannels(new ChannelQuery
{
Limit = 0,
UserId = query.UserId
}, cancellationToken), cancellationToken);
// Avoid implicitly captured closure.
var token = cancellationToken;
var liveTvTask = Task.Run(() => _liveTvManager.GetLiveTvInfo(token), cancellationToken);
await Task.WhenAll(channelsTask, liveTvTask).ConfigureAwait(false);
var channelResult = channelsTask.Result;
}, cancellationToken).ConfigureAwait(false);
if (channelResult.TotalRecordCount > 0)
{
list.Add(await _channelManager.GetInternalChannelFolder(query.UserId, cancellationToken).ConfigureAwait(false));
}
var liveTvInfo = liveTvTask.Result;
if (liveTvInfo.EnabledUsers.Contains(query.UserId))
if (_liveTvManager.GetEnabledUsers().Select(i => i.Id.ToString("N")).Contains(query.UserId))
{
list.Add(await _liveTvManager.GetInternalLiveTvFolder(query.UserId, cancellationToken).ConfigureAwait(false));
}