mirror of https://github.com/jellyfin/jellyfin.git
Merge b097c16768
into e2a22cec0e
This commit is contained in:
commit
c1cd37b389
|
@ -1868,8 +1868,14 @@ namespace Emby.Server.Implementations.Library
|
|||
var outdated = forceUpdate
|
||||
? item.ImageInfos.Where(i => i.Path is not null).ToArray()
|
||||
: item.ImageInfos.Where(ImageNeedsRefresh).ToArray();
|
||||
// Skip image processing if current or live tv source
|
||||
if (outdated.Length == 0 || item.SourceType != SourceType.Library)
|
||||
|
||||
var parentItem = item.GetParent();
|
||||
var isLiveTvShow = item.SourceType != SourceType.Library &&
|
||||
parentItem is not null &&
|
||||
parentItem.SourceType != SourceType.Library; // not a channel
|
||||
|
||||
// Skip image processing if current or live tv show
|
||||
if (outdated.Length == 0 || isLiveTvShow)
|
||||
{
|
||||
RegisterItem(item);
|
||||
return;
|
||||
|
|
|
@ -432,14 +432,19 @@ public class GuideManager : IGuideManager
|
|||
|
||||
item.Name = channelInfo.Name;
|
||||
|
||||
if (!item.HasImage(ImageType.Primary))
|
||||
var currentPrimary = item.GetImageInfo(ImageType.Primary, 0);
|
||||
var imageUrlIsNull = string.IsNullOrWhiteSpace(channelInfo.ImageUrl);
|
||||
|
||||
// Update channel image if image URL has changed
|
||||
if (currentPrimary is null
|
||||
|| (!imageUrlIsNull && currentPrimary.Path != channelInfo.ImageUrl))
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(channelInfo.ImagePath))
|
||||
{
|
||||
item.SetImagePath(ImageType.Primary, channelInfo.ImagePath);
|
||||
forceUpdate = true;
|
||||
}
|
||||
else if (!string.IsNullOrWhiteSpace(channelInfo.ImageUrl))
|
||||
else if (!imageUrlIsNull)
|
||||
{
|
||||
item.SetImagePath(ImageType.Primary, channelInfo.ImageUrl);
|
||||
forceUpdate = true;
|
||||
|
|
Loading…
Reference in New Issue