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/ChannelImageProvider.cs | 56 +++++++++++++++++++ .../Channels/ChannelItemImageProvider.cs | 5 -- .../Channels/ChannelManager.cs | 43 ++++++++++++--- .../Channels/RefreshChannelsScheduledTask.cs | 63 ++++++++++++++++++++++ .../MediaBrowser.Server.Implementations.csproj | 2 + 5 files changed, 157 insertions(+), 12 deletions(-) create mode 100644 MediaBrowser.Server.Implementations/Channels/ChannelImageProvider.cs create mode 100644 MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelImageProvider.cs b/MediaBrowser.Server.Implementations/Channels/ChannelImageProvider.cs new file mode 100644 index 000000000..627de3235 --- /dev/null +++ b/MediaBrowser.Server.Implementations/Channels/ChannelImageProvider.cs @@ -0,0 +1,56 @@ +using MediaBrowser.Controller.Channels; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Providers; +using MediaBrowser.Model.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; + +namespace MediaBrowser.Server.Implementations.Channels +{ + public class ChannelImageProvider : IDynamicImageProvider, IHasChangeMonitor + { + private readonly IChannelManager _channelManager; + + public ChannelImageProvider(IChannelManager channelManager) + { + _channelManager = channelManager; + } + + public IEnumerable GetSupportedImages(IHasImages item) + { + return GetChannel(item).GetSupportedChannelImages(); + } + + public Task GetImage(IHasImages item, ImageType type, CancellationToken cancellationToken) + { + var channel = GetChannel(item); + + return channel.GetChannelImage(type, cancellationToken); + } + + public string Name + { + get { return "Channel Image Provider"; } + } + + public bool Supports(IHasImages item) + { + return item is Channel; + } + + public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date) + { + return GetSupportedImages(item).Any(i => !item.HasImage(i)); + } + + private IChannel GetChannel(IHasImages item) + { + var channel = (Channel)item; + + return ((ChannelManager)_channelManager).GetChannelProvider(channel); + } + } +} diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelItemImageProvider.cs b/MediaBrowser.Server.Implementations/Channels/ChannelItemImageProvider.cs index 23504aaaa..94cd8c453 100644 --- a/MediaBrowser.Server.Implementations/Channels/ChannelItemImageProvider.cs +++ b/MediaBrowser.Server.Implementations/Channels/ChannelItemImageProvider.cs @@ -68,11 +68,6 @@ namespace MediaBrowser.Server.Implementations.Channels return item is IChannelItem; } - public int Order - { - get { return 0; } - } - public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date) { var channelItem = item as IChannelItem; 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)); } diff --git a/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs b/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs new file mode 100644 index 000000000..ee75e4d05 --- /dev/null +++ b/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs @@ -0,0 +1,63 @@ +using MediaBrowser.Common.ScheduledTasks; +using MediaBrowser.Controller.Channels; +using MediaBrowser.Model.Tasks; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace MediaBrowser.Server.Implementations.Channels +{ + class RefreshChannelsScheduledTask : IScheduledTask, IConfigurableScheduledTask + { + private readonly IChannelManager _manager; + + public RefreshChannelsScheduledTask(IChannelManager manager) + { + _manager = manager; + } + + public string Name + { + get { return "Refresh Channels"; } + } + + public string Description + { + get { return "Refreshes internet channel information."; } + } + + public string Category + { + get { return "Channels"; } + } + + public Task Execute(System.Threading.CancellationToken cancellationToken, IProgress progress) + { + var manager = (ChannelManager)_manager; + + return manager.RefreshChannels(progress, cancellationToken); + } + + public IEnumerable GetDefaultTriggers() + { + return new ITaskTrigger[] + { + new StartupTrigger(), + + new SystemEventTrigger{ SystemEvent = SystemEvent.WakeFromSleep}, + + new IntervalTrigger{ Interval = TimeSpan.FromHours(24)} + }; + } + + public bool IsHidden + { + get { return true; } + } + + public bool IsEnabled + { + get { return true; } + } + } +} diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 495288e4f..73a12caf2 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -106,8 +106,10 @@ Properties\SharedVersion.cs + + -- cgit v1.2.3