From 4d1d2bbaa15e89155bf5bf289ee190db6f155bca Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 18 Mar 2014 13:05:57 -0400 Subject: Add more channel features --- .../Channels/ChannelManager.cs | 43 ++++++++++++++++++---- 1 file changed, 36 insertions(+), 7 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Channels/ChannelManager.cs') diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs index 630c7373e..22b7e7054 100644 --- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs +++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs @@ -202,16 +202,19 @@ namespace MediaBrowser.Server.Implementations.Channels return await GetReturnItems(items, user, query.StartIndex, query.Limit, cancellationToken).ConfigureAwait(false); } - private Task> GetChannelItems(IChannel channel, User user, string categoryId, CancellationToken cancellationToken) + private async Task> GetChannelItems(IChannel channel, User user, string categoryId, CancellationToken cancellationToken) { // TODO: Put some caching in here - if (string.IsNullOrWhiteSpace(categoryId)) + var query = new InternalChannelItemQuery { - return channel.GetChannelItems(user, cancellationToken); - } + User = user, + CategoryId = categoryId + }; - return channel.GetChannelItems(categoryId, user, cancellationToken); + var result = await channel.GetChannelItems(query, cancellationToken).ConfigureAwait(false); + + return result.Items; } private async Task> GetReturnItems(IEnumerable items, User user, int? startIndex, int? limit, CancellationToken cancellationToken) @@ -246,10 +249,36 @@ namespace MediaBrowser.Server.Implementations.Channels private async Task GetChannelItemEntity(ChannelItemInfo info) { - return null; + BaseItem item; + + if (info.Type == ChannelItemType.Category) + { + item = new ChannelCategoryItem(); + } + else if (info.MediaType == ChannelMediaType.Audio) + { + item = new ChannelAudioItem(); + } + else + { + item = new ChannelVideoItem(); + } + + item.Name = info.Name; + item.Genres = info.Genres; + item.CommunityRating = info.CommunityRating; + item.OfficialRating = info.OfficialRating; + item.Overview = info.Overview; + item.People = info.People; + item.PremiereDate = info.PremiereDate; + item.ProductionYear = info.ProductionYear; + item.RunTimeTicks = info.RunTimeTicks; + item.ProviderIds = info.ProviderIds; + + return item; } - private IChannel GetChannelProvider(Channel channel) + internal IChannel GetChannelProvider(Channel channel) { return _channels.First(i => string.Equals(i.Name, channel.OriginalChannelName, StringComparison.OrdinalIgnoreCase)); } -- cgit v1.2.3