mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-23 22:21:04 +02:00
update recording creation
This commit is contained in:
parent
c3cbbcfca8
commit
a17f7d89f7
|
@ -345,9 +345,9 @@ namespace MediaBrowser.Controller.LiveTv
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="item">The item.</param>
|
/// <param name="item">The item.</param>
|
||||||
/// <param name="dto">The dto.</param>
|
/// <param name="dto">The dto.</param>
|
||||||
/// <param name="addChannelInfo">if set to <c>true</c> [add channel information].</param>
|
/// <param name="fields">The fields.</param>
|
||||||
/// <param name="user">The user.</param>
|
/// <param name="user">The user.</param>
|
||||||
void AddInfoToProgramDto(BaseItem item, BaseItemDto dto, bool addChannelInfo, User user = null);
|
void AddInfoToProgramDto(BaseItem item, BaseItemDto dto, List<ItemFields> fields, User user = null);
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Saves the tuner host.
|
/// Saves the tuner host.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -192,6 +192,7 @@ namespace MediaBrowser.Model.Dto
|
||||||
/// <value>The channel identifier.</value>
|
/// <value>The channel identifier.</value>
|
||||||
public string ChannelId { get; set; }
|
public string ChannelId { get; set; }
|
||||||
public string ChannelName { get; set; }
|
public string ChannelName { get; set; }
|
||||||
|
public string ServiceName { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the overview.
|
/// Gets or sets the overview.
|
||||||
|
|
|
@ -253,6 +253,11 @@
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The season user data
|
/// The season user data
|
||||||
/// </summary>
|
/// </summary>
|
||||||
SeasonUserData
|
SeasonUserData,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The service name
|
||||||
|
/// </summary>
|
||||||
|
ServiceName
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -395,7 +395,7 @@ namespace MediaBrowser.Server.Implementations.Dto
|
||||||
|
|
||||||
else if (item is LiveTvProgram)
|
else if (item is LiveTvProgram)
|
||||||
{
|
{
|
||||||
_livetvManager().AddInfoToProgramDto(item, dto, fields.Contains(ItemFields.ChannelInfo), user);
|
_livetvManager().AddInfoToProgramDto(item, dto, fields, user);
|
||||||
}
|
}
|
||||||
|
|
||||||
return dto;
|
return dto;
|
||||||
|
|
|
@ -845,7 +845,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
|
||||||
{
|
{
|
||||||
if (GetConfiguration().EnableRecordingEncoding)
|
if (GetConfiguration().EnableRecordingEncoding)
|
||||||
{
|
{
|
||||||
var regInfo = await _security.GetRegistrationStatus("embytvseriesrecordings").ConfigureAwait(false);
|
var regInfo = await _security.GetRegistrationStatus("embytvrecordingconversion").ConfigureAwait(false);
|
||||||
|
|
||||||
if (regInfo.IsValid)
|
if (regInfo.IsValid)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1467,7 +1467,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddInfoToProgramDto(BaseItem item, BaseItemDto dto, bool addChannelInfo, User user = null)
|
public void AddInfoToProgramDto(BaseItem item, BaseItemDto dto, List<ItemFields> fields, User user = null)
|
||||||
{
|
{
|
||||||
var program = (LiveTvProgram)item;
|
var program = (LiveTvProgram)item;
|
||||||
|
|
||||||
|
@ -1507,7 +1507,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
dto.IsPremiere = program.IsPremiere;
|
dto.IsPremiere = program.IsPremiere;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (addChannelInfo)
|
if (fields.Contains(ItemFields.ChannelInfo))
|
||||||
{
|
{
|
||||||
var channel = GetInternalChannel(program.ChannelId);
|
var channel = GetInternalChannel(program.ChannelId);
|
||||||
|
|
||||||
|
@ -1522,6 +1522,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (fields.Contains(ItemFields.ServiceName))
|
||||||
|
{
|
||||||
|
var service = GetService(program);
|
||||||
|
if (service != null)
|
||||||
|
{
|
||||||
|
dto.ServiceName = service.Name;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddInfoToRecordingDto(BaseItem item, BaseItemDto dto, User user = null)
|
public void AddInfoToRecordingDto(BaseItem item, BaseItemDto dto, User user = null)
|
||||||
|
|
Loading…
Reference in a new issue