alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-10 04:06:17 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

added live tv items page

Browse Source
This commit is contained in:
Luke Pulverenti
2015-03-14 16:56:50 -04:00
parent b1d2841583
commit cde1df51ec
6 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
View File

@@ -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)

13
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@@ -685,19 +685,20 @@ namespace MediaBrowser.Server.Implementations.LiveTv
programs = _libraryManager.Sort(programs, user, query.SortBy, query.SortOrder ?? SortOrder.Ascending)
.Cast<LiveTvProgram>();
var programList = programs.ToList();
IEnumerable<LiveTvProgram> 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<ProgramInfoDto>
{
Items = returnArray,
TotalRecordCount = returnArray.Length
TotalRecordCount = programList.Count
};
return result;

5
MediaBrowser.Server.Implementations/Localization/Server/server.json
View File

@@ -1391,5 +1391,8 @@
"HeaderThisUserIsCurrentlyDisabled": "This user is currently disabled",
"MessageReenableUser": "See below to reenable",
"LabelEnableInternetMetadataForTvPrograms": "Download internet metadata for:",
"OptionTVMovies": "TV Movies"
"OptionTVMovies": "TV Movies",
"HeaderUpcomingMovies": "Upcoming Movies",
"HeaderUpcomingPrograms": "Upcoming Programs",
"ButtonMoreItems": "More..."
}