From 28ab28768a307d1cac60ebe79163b98291068cde Mon Sep 17 00:00:00 2001 From: Sven Van den brande Date: Thu, 31 Oct 2013 21:45:58 +0100 Subject: [PATCH] Adding RecordingInfo --- MediaBrowser.Api/LiveTv/LiveTvService.cs | 65 ++++++++++++------ MediaBrowser.Controller/LiveTv/ChannelInfo.cs | 2 + .../LiveTv/ILiveTvManager.cs | 3 +- .../LiveTv/ILiveTvService.cs | 3 + .../MediaBrowser.Model.Portable.csproj | 3 + .../MediaBrowser.Model.net35.csproj | 3 + MediaBrowser.Model/Dto/RecordingInfoDto.cs | 12 ++++ MediaBrowser.Model/LiveTv/ChannelInfoDto.cs | 2 + MediaBrowser.Model/LiveTv/RecordingInfo.cs | 27 ++++++++ MediaBrowser.Model/MediaBrowser.Model.csproj | 1 + .../LiveTv/LiveTvManager.cs | 3 +- .../NextPvr/LiveTvService.cs | 66 +++++++++++++++++++ MediaBrowser.sln | 3 - 13 files changed, 168 insertions(+), 25 deletions(-) create mode 100644 MediaBrowser.Model/Dto/RecordingInfoDto.cs create mode 100644 MediaBrowser.Model/LiveTv/RecordingInfo.cs create mode 100644 MediaBrowser.ServerApplication/NextPvr/LiveTvService.cs diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs index 579517aeb0..f8e7b63709 100644 --- a/MediaBrowser.Api/LiveTv/LiveTvService.cs +++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs @@ -20,6 +20,13 @@ namespace MediaBrowser.Api.LiveTv { // Add filter by service if needed, and/or other filters } + + [Route("/LiveTv/Recordings", "GET")] + [Api(Description = "Gets available live tv recordings.")] + public class GetRecordings : IReturn> + { + // Add filter by service if needed, and/or other filters + } public class LiveTvService : BaseApiService { @@ -40,26 +47,6 @@ namespace MediaBrowser.Api.LiveTv return ToOptimizedResult(result); } - public object Get(GetChannels request) - { - var result = GetChannelsAsync(request).Result; - - return ToOptimizedResult(result); - } - - public async Task> GetChannelsAsync(GetChannels request) - { - var services = _liveTvManager.Services; - - var channelTasks = services.Select(i => i.GetChannelsAsync(CancellationToken.None)); - - var channelLists = await Task.WhenAll(channelTasks).ConfigureAwait(false); - - // Aggregate all channels from all services - return channelLists.SelectMany(i => i) - .Select(_liveTvManager.GetChannelInfoDto); - } - private LiveTvServiceInfo GetServiceInfo(ILiveTvService service) { return new LiveTvServiceInfo @@ -67,5 +54,43 @@ namespace MediaBrowser.Api.LiveTv Name = service.Name }; } + + public object Get(GetChannels request) + { + var result = GetChannelsAsync(request).Result; + + return ToOptimizedResult(result); + } + + private async Task> GetChannelsAsync(GetChannels request) + { + var services = _liveTvManager.Services; + + var tasks = services.Select(i => i.GetChannelsAsync(CancellationToken.None)); + + var channelLists = await Task.WhenAll(tasks).ConfigureAwait(false); + + // Aggregate all channels from all services + return channelLists.SelectMany(i => i) + .Select(_liveTvManager.GetChannelInfoDto); + } + + public object Get(GetRecordings request) + { + var result = GetRecordingsAsync(request).Result; + + return ToOptimizedResult(result); + } + + private async Task> GetRecordingsAsync(GetRecordings request) + { + var services = _liveTvManager.Services; + + var tasks = services.Select(i => i.GetRecordingsAsync(CancellationToken.None)); + + var recordings = await Task.WhenAll(tasks).ConfigureAwait(false); + + return recordings.SelectMany(i => i); + } } } diff --git a/MediaBrowser.Controller/LiveTv/ChannelInfo.cs b/MediaBrowser.Controller/LiveTv/ChannelInfo.cs index 7ad1ec6c9b..547fc6287c 100644 --- a/MediaBrowser.Controller/LiveTv/ChannelInfo.cs +++ b/MediaBrowser.Controller/LiveTv/ChannelInfo.cs @@ -13,6 +13,8 @@ namespace MediaBrowser.Controller.LiveTv /// The name. public string Name { get; set; } + public string Id { get; set; } + /// /// Gets or sets the name of the service. /// diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs index de88d15620..62bfdf3e58 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Model.LiveTv; +using System.Threading.Tasks; +using MediaBrowser.Model.LiveTv; using System.Collections.Generic; namespace MediaBrowser.Controller.LiveTv diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvService.cs b/MediaBrowser.Controller/LiveTv/ILiveTvService.cs index 4d9ec85311..a1e002bc82 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvService.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvService.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using MediaBrowser.Model.LiveTv; namespace MediaBrowser.Controller.LiveTv { @@ -21,5 +22,7 @@ namespace MediaBrowser.Controller.LiveTv /// The cancellation token. /// Task{IEnumerable{ChannelInfo}}. Task> GetChannelsAsync(CancellationToken cancellationToken); + + Task> GetRecordingsAsync(CancellationToken cancellationToken); } } diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index e88953b9c1..9027a814e2 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -233,6 +233,9 @@ LiveTv\LiveTvServiceInfo.cs + + LiveTv\RecordingInfo.cs + Logging\ILogger.cs diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj index 6a14817a60..e13c348e04 100644 --- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj +++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj @@ -220,6 +220,9 @@ LiveTv\LiveTvServiceInfo.cs + + LiveTv\RecordingInfo.cs + Logging\ILogger.cs diff --git a/MediaBrowser.Model/Dto/RecordingInfoDto.cs b/MediaBrowser.Model/Dto/RecordingInfoDto.cs new file mode 100644 index 0000000000..4151c5a9c8 --- /dev/null +++ b/MediaBrowser.Model/Dto/RecordingInfoDto.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MediaBrowser.Model.Dto +{ + public class RecordingInfoDto + { + } +} diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs index c77d7ed127..15c9055817 100644 --- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs +++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs @@ -12,6 +12,8 @@ namespace MediaBrowser.Model.LiveTv /// The name. public string Name { get; set; } + public string Id { get; set; } + /// /// Gets or sets the name of the service. /// diff --git a/MediaBrowser.Model/LiveTv/RecordingInfo.cs b/MediaBrowser.Model/LiveTv/RecordingInfo.cs new file mode 100644 index 0000000000..dab37a3812 --- /dev/null +++ b/MediaBrowser.Model/LiveTv/RecordingInfo.cs @@ -0,0 +1,27 @@ +using System; + +namespace MediaBrowser.Model.LiveTv +{ + public class RecordingInfo + { + public string ChannelId { get; set; } + + public string ChannelName { get; set; } + + public string Id { get; set; } + + public string Name { get; set; } + + public string Description { get; set; } + + /// + /// The start date of the recording, in UTC + /// + public DateTime StartDate { get; set; } + + /// + /// The end date of the recording, in UTC + /// + public DateTime EndDate { get; set; } + } +} diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index caf89346cd..b49368cf73 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -73,6 +73,7 @@ + diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs index 34be46d726..20beb551d5 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs @@ -39,7 +39,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv { Name = info.Name, ServiceName = info.ServiceName, - ChannelType = info.ChannelType + ChannelType = info.ChannelType, + Id = info.Id }; } } diff --git a/MediaBrowser.ServerApplication/NextPvr/LiveTvService.cs b/MediaBrowser.ServerApplication/NextPvr/LiveTvService.cs new file mode 100644 index 0000000000..ab72b2c8e1 --- /dev/null +++ b/MediaBrowser.ServerApplication/NextPvr/LiveTvService.cs @@ -0,0 +1,66 @@ +using MediaBrowser.Common.Configuration; +using MediaBrowser.Common.Net; +using MediaBrowser.Controller.LiveTv; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Serialization; + +namespace MediaBrowser.Plugins.NextPvr +{ + /// + /// Class LiveTvService + /// + public class LiveTvService : ILiveTvService + { + private readonly ILogger _logger; + + private IApplicationPaths _appPaths; + private IJsonSerializer _json; + private IHttpClient _httpClient; + + public LiveTvService(ILogger logger) + { + _logger = logger; + } + + /// + /// Gets the channels async. + /// + /// The cancellation token. + /// Task{IEnumerable{ChannelInfo}}. + public Task> GetChannelsAsync(CancellationToken cancellationToken) + { + //using (var stream = await _httpClient.Get(new HttpRequestOptions() + // { + // Url = "", + // CancellationToken = cancellationToken + // })) + //{ + + //} + _logger.Info("GetChannelsAsync"); + + var channels = new List + { + new ChannelInfo + { + Name = "NBC", + ServiceName = Name + } + }; + + return Task.FromResult>(channels); + } + + /// + /// Gets the name. + /// + /// The name. + public string Name + { + get { return "Next Pvr"; } + } + } +} diff --git a/MediaBrowser.sln b/MediaBrowser.sln index 0c5360b494..744debbcd2 100644 --- a/MediaBrowser.sln +++ b/MediaBrowser.sln @@ -237,7 +237,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection EndGlobal