michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added create live tv timer page

Browse Source
This commit is contained in:
Luke Pulverenti 2013-11-29 13:44:51 -05:00
parent 235b838fbe
commit 0c398a5670
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
View File

@ -1,5 +1,7 @@
using System; using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;
namespace MediaBrowser.Model.LiveTv namespace MediaBrowser.Model.LiveTv
{ {
@ -21,10 +23,10 @@ namespace MediaBrowser.Model.LiveTv
public string Id { get; set; } public string Id { get; set; }
/// <summary> /// <summary>
/// Gets or sets the logo image tag. /// Gets or sets the image tags.
/// </summary> /// </summary>
/// <value>The logo image tag.</value> /// <value>The image tags.</value>
public Guid? PrimaryImageTag { get; set; } public Dictionary<ImageType, Guid> ImageTags { get; set; }
/// <summary> /// <summary>
/// Gets or sets the number. /// Gets or sets the number.
@ -61,5 +63,10 @@ namespace MediaBrowser.Model.LiveTv
/// </summary> /// </summary>
/// <value>The user data.</value> /// <value>The user data.</value>
public UserItemDataDto UserData { get; set; } public UserItemDataDto UserData { get; set; }
public ChannelInfoDto()
{
ImageTags = new Dictionary<ImageType, Guid>();
}
} }
} }

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

@ -87,7 +87,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
ServiceName = info.ServiceName, ServiceName = info.ServiceName,
ChannelType = info.ChannelType, ChannelType = info.ChannelType,
Number = info.ChannelNumber, Number = info.ChannelNumber,
PrimaryImageTag = GetLogoImageTag(info),
Type = info.GetType().Name, Type = info.GetType().Name,
Id = info.Id.ToString("N"), Id = info.Id.ToString("N"),
MediaType = info.MediaType MediaType = info.MediaType
@ -98,6 +97,13 @@ namespace MediaBrowser.Server.Implementations.LiveTv
dto.UserData = _dtoService.GetUserItemDataDto(_userDataManager.GetUserData(user.Id, info.GetUserDataKey())); dto.UserData = _dtoService.GetUserItemDataDto(_userDataManager.GetUserData(user.Id, info.GetUserDataKey()));
} }
var imageTag = GetLogoImageTag(info);
if (imageTag.HasValue)
{
dto.ImageTags[ImageType.Primary] = imageTag.Value;
}
return dto; return dto;
} }

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

@ -483,6 +483,7 @@ namespace MediaBrowser.WebDashboard.Api
"livetvchannels.js", "livetvchannels.js",
"livetvguide.js", "livetvguide.js",
"livetvrecordings.js", "livetvrecordings.js",
"livetvtimer.js",
"livetvtimers.js", "livetvtimers.js",
"loginpage.js", "loginpage.js",
"logpage.js", "logpage.js",

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

@ -347,6 +347,12 @@
<Content Include="dashboard-ui\scripts\livetvchannel.js"> <Content Include="dashboard-ui\scripts\livetvchannel.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\livetvtimer.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\livetvtimer.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\livetvtimers.js"> <Content Include="dashboard-ui\scripts\livetvtimers.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>