Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-23 15:30:56 -04:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
View File

@ -95,7 +95,13 @@ namespace MediaBrowser.Model.LiveTv
/// </summary> /// </summary>
/// <value>The official rating.</value> /// <value>The official rating.</value>
public string OfficialRating { get; set; } public string OfficialRating { get; set; }
/// <summary>
/// Gets or sets the production year.
/// </summary>
/// <value>The production year.</value>
public int? ProductionYear { get; set; }
/// <summary> /// <summary>
/// Gets or sets the name of the service. /// Gets or sets the name of the service.
/// </summary> /// </summary>

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

@ -387,7 +387,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
IsPremiere = item.IsPremiere, IsPremiere = item.IsPremiere,
Type = "Program", Type = "Program",
MediaType = item.MediaType, MediaType = item.MediaType,
ServerId = _appHost.SystemId ServerId = _appHost.SystemId,
ProductionYear = item.ProductionYear
}; };
if (item.EndDate.HasValue) 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) programs = _libraryManager.Sort(programs, user, query.SortBy, query.SortOrder ?? SortOrder.Ascending)
.Cast<LiveTvProgram>(); .Cast<LiveTvProgram>();
var programList = programs.ToList();
IEnumerable<LiveTvProgram> returnPrograms = programList;
if (query.StartIndex.HasValue) if (query.StartIndex.HasValue)
{ {
programs = programs.Skip(query.StartIndex.Value); returnPrograms = returnPrograms.Skip(query.StartIndex.Value);
} }
if (query.Limit.HasValue) if (query.Limit.HasValue)
{ {
programs = programs.Take(query.Limit.Value); returnPrograms = returnPrograms.Take(query.Limit.Value);
} }
var programList = programs.ToList(); var returnArray = returnPrograms
var returnArray = programList
.Select(i => .Select(i =>
{ {
var channel = GetChannel(i); var channel = GetChannel(i);
@ -713,7 +714,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
var result = new QueryResult<ProgramInfoDto> var result = new QueryResult<ProgramInfoDto>
{ {
Items = returnArray, Items = returnArray,
TotalRecordCount = returnArray.Length TotalRecordCount = programList.Count
}; };
return result; return result;

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

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

1
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -429,6 +429,7 @@ namespace MediaBrowser.WebDashboard.Api
"livetvchannel.js", "livetvchannel.js",
"livetvchannels.js", "livetvchannels.js",
"livetvguide.js", "livetvguide.js",
"livetvitems.js",
"livetvnewrecording.js", "livetvnewrecording.js",
"livetvprogram.js", "livetvprogram.js",
"livetvrecording.js", "livetvrecording.js",

6
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -120,6 +120,9 @@
<Content Include="dashboard-ui\kids.html"> <Content Include="dashboard-ui\kids.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\livetvitems.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\mysync.html"> <Content Include="dashboard-ui\mysync.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -138,6 +141,9 @@
<Content Include="dashboard-ui\scripts\kids.js"> <Content Include="dashboard-ui\scripts\kids.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\scripts\livetvitems.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\selectserver.js"> <Content Include="dashboard-ui\scripts\selectserver.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>