update timer images
This commit is contained in:
parent
2481c5d9f8
commit
c99fa9a651
|
@ -30,6 +30,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
|
||||||
Priority = seriesTimer.Priority,
|
Priority = seriesTimer.Priority,
|
||||||
Name = parent.Name,
|
Name = parent.Name,
|
||||||
Overview = parent.Overview,
|
Overview = parent.Overview,
|
||||||
|
SeriesId = parent.SeriesId,
|
||||||
SeriesTimerId = seriesTimer.Id,
|
SeriesTimerId = seriesTimer.Id,
|
||||||
ShowId = parent.ShowId
|
ShowId = parent.ShowId
|
||||||
};
|
};
|
||||||
|
@ -63,6 +64,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
|
||||||
timerInfo.ShortOverview = programInfo.ShortOverview;
|
timerInfo.ShortOverview = programInfo.ShortOverview;
|
||||||
timerInfo.OfficialRating = programInfo.OfficialRating;
|
timerInfo.OfficialRating = programInfo.OfficialRating;
|
||||||
timerInfo.IsRepeat = programInfo.IsRepeat;
|
timerInfo.IsRepeat = programInfo.IsRepeat;
|
||||||
|
timerInfo.SeriesId = programInfo.SeriesId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string GetRecordingName(TimerInfo info)
|
public static string GetRecordingName(TimerInfo info)
|
||||||
|
|
|
@ -14,6 +14,7 @@ using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using MediaBrowser.Controller.Entities.TV;
|
using MediaBrowser.Controller.Entities.TV;
|
||||||
|
using MediaBrowser.Model.Dto;
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.LiveTv
|
namespace Emby.Server.Implementations.LiveTv
|
||||||
{
|
{
|
||||||
|
@ -80,6 +81,11 @@ namespace Emby.Server.Implementations.LiveTv
|
||||||
}
|
}
|
||||||
|
|
||||||
dto.ProgramInfo.SeriesTimerId = dto.SeriesTimerId;
|
dto.ProgramInfo.SeriesTimerId = dto.SeriesTimerId;
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(info.SeriesTimerId))
|
||||||
|
{
|
||||||
|
FillImages(dto.ProgramInfo, info.Name, info.SeriesId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (channel != null)
|
if (channel != null)
|
||||||
|
@ -131,17 +137,17 @@ namespace Emby.Server.Implementations.LiveTv
|
||||||
|
|
||||||
dto.DayPattern = info.Days == null ? null : GetDayPattern(info.Days);
|
dto.DayPattern = info.Days == null ? null : GetDayPattern(info.Days);
|
||||||
|
|
||||||
FillImages(dto, info);
|
FillImages(dto, info.Name, info.SeriesId);
|
||||||
|
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void FillImages(SeriesTimerInfoDto dto, SeriesTimerInfo info)
|
private void FillImages(BaseItemDto dto, string seriesName, string programSeriesId)
|
||||||
{
|
{
|
||||||
var librarySeries = _libraryManager.GetItemList(new InternalItemsQuery
|
var librarySeries = _libraryManager.GetItemList(new InternalItemsQuery
|
||||||
{
|
{
|
||||||
IncludeItemTypes = new string[] { typeof(Series).Name },
|
IncludeItemTypes = new string[] { typeof(Series).Name },
|
||||||
Name = info.Name,
|
Name = seriesName,
|
||||||
Limit = 1,
|
Limit = 1,
|
||||||
ImageTypes = new ImageType[] { ImageType.Thumb }
|
ImageTypes = new ImageType[] { ImageType.Thumb }
|
||||||
|
|
||||||
|
@ -163,12 +169,68 @@ namespace Emby.Server.Implementations.LiveTv
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(info.SeriesId))
|
if (!string.IsNullOrWhiteSpace(programSeriesId))
|
||||||
{
|
{
|
||||||
var program = _libraryManager.GetItemList(new InternalItemsQuery
|
var program = _libraryManager.GetItemList(new InternalItemsQuery
|
||||||
{
|
{
|
||||||
IncludeItemTypes = new string[] { typeof(LiveTvProgram).Name },
|
IncludeItemTypes = new string[] { typeof(LiveTvProgram).Name },
|
||||||
ExternalSeriesId = info.SeriesId,
|
ExternalSeriesId = programSeriesId,
|
||||||
|
Limit = 1,
|
||||||
|
ImageTypes = new ImageType[] { ImageType.Primary }
|
||||||
|
|
||||||
|
}).FirstOrDefault();
|
||||||
|
|
||||||
|
if (program != null)
|
||||||
|
{
|
||||||
|
var image = program.GetImageInfo(ImageType.Primary, 0);
|
||||||
|
if (image != null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
dto.ParentPrimaryImageTag = _imageProcessor.GetImageCacheTag(program, image);
|
||||||
|
dto.ParentPrimaryImageItemId = program.Id.ToString("N");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void FillImages(SeriesTimerInfoDto dto, string seriesName, string programSeriesId)
|
||||||
|
{
|
||||||
|
var librarySeries = _libraryManager.GetItemList(new InternalItemsQuery
|
||||||
|
{
|
||||||
|
IncludeItemTypes = new string[] { typeof(Series).Name },
|
||||||
|
Name = seriesName,
|
||||||
|
Limit = 1,
|
||||||
|
ImageTypes = new ImageType[] { ImageType.Thumb }
|
||||||
|
|
||||||
|
}).FirstOrDefault();
|
||||||
|
|
||||||
|
if (librarySeries != null)
|
||||||
|
{
|
||||||
|
var image = librarySeries.GetImageInfo(ImageType.Thumb, 0);
|
||||||
|
if (image != null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
dto.ParentThumbImageTag = _imageProcessor.GetImageCacheTag(librarySeries, image);
|
||||||
|
dto.ParentThumbItemId = librarySeries.Id.ToString("N");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(programSeriesId))
|
||||||
|
{
|
||||||
|
var program = _libraryManager.GetItemList(new InternalItemsQuery
|
||||||
|
{
|
||||||
|
IncludeItemTypes = new string[] { typeof(LiveTvProgram).Name },
|
||||||
|
ExternalSeriesId = programSeriesId,
|
||||||
Limit = 1,
|
Limit = 1,
|
||||||
ImageTypes = new ImageType[] { ImageType.Primary }
|
ImageTypes = new ImageType[] { ImageType.Primary }
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,8 @@ namespace MediaBrowser.Controller.LiveTv
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Overview { get; set; }
|
public string Overview { get; set; }
|
||||||
|
|
||||||
|
public string SeriesId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The start date of the recording, in UTC.
|
/// The start date of the recording, in UTC.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user