michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1898 from MediaBrowser/dev

Browse Source 
update channel queries
This commit is contained in:
Luke 2016-06-30 15:26:05 -04:00 committed by GitHub
commit 5bdc96bb6a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@ -33,6 +33,7 @@ using System.Net;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using CommonIO; using CommonIO;
using MediaBrowser.Model.Channels;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Extensions; using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.Library; using MediaBrowser.Model.Library;
@ -1512,8 +1513,13 @@ namespace MediaBrowser.Server.Implementations.Library
} }
if (string.Equals(view.ViewType, CollectionType.Channels)) if (string.Equals(view.ViewType, CollectionType.Channels))
{ {
// TODO: Return channels var channelResult = BaseItem.ChannelManager.GetChannelsInternal(new ChannelQuery
return new[] { view }; {
UserId = user.Id.ToString("N")
}, CancellationToken.None).Result;
return channelResult.Items;
} }
// Translate view into folders // Translate view into folders