From cde1df51ec093b1d35fd5fa5e89c528ff079a887 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 14 Mar 2015 16:56:50 -0400 Subject: added live tv items page --- .../LiveTv/LiveTvDtoService.cs | 3 ++- MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'MediaBrowser.Server.Implementations/LiveTv') diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs index 6473d10d6..7f4440fbc 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs @@ -387,7 +387,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv IsPremiere = item.IsPremiere, Type = "Program", MediaType = item.MediaType, - ServerId = _appHost.SystemId + ServerId = _appHost.SystemId, + ProductionYear = item.ProductionYear }; if (item.EndDate.HasValue) diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs index acff25e96..6b66ed9b8 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs @@ -685,19 +685,20 @@ namespace MediaBrowser.Server.Implementations.LiveTv programs = _libraryManager.Sort(programs, user, query.SortBy, query.SortOrder ?? SortOrder.Ascending) .Cast(); + var programList = programs.ToList(); + IEnumerable returnPrograms = programList; + if (query.StartIndex.HasValue) { - programs = programs.Skip(query.StartIndex.Value); + returnPrograms = returnPrograms.Skip(query.StartIndex.Value); } if (query.Limit.HasValue) { - programs = programs.Take(query.Limit.Value); + returnPrograms = returnPrograms.Take(query.Limit.Value); } - var programList = programs.ToList(); - - var returnArray = programList + var returnArray = returnPrograms .Select(i => { var channel = GetChannel(i); @@ -713,7 +714,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv var result = new QueryResult { Items = returnArray, - TotalRecordCount = returnArray.Length + TotalRecordCount = programList.Count }; return result; -- cgit v1.2.3