diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index ec688bd9f4..7086ac7437 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1479,6 +1479,7 @@ namespace MediaBrowser.Controller.Entities
image.Path = file.FullName;
image.DateModified = imageInfo.DateModified;
+ image.IsPlaceholder = false;
}
}
diff --git a/MediaBrowser.Controller/Entities/ItemImageInfo.cs b/MediaBrowser.Controller/Entities/ItemImageInfo.cs
index bb113e596d..aa3917c15f 100644
--- a/MediaBrowser.Controller/Entities/ItemImageInfo.cs
+++ b/MediaBrowser.Controller/Entities/ItemImageInfo.cs
@@ -24,6 +24,12 @@ namespace MediaBrowser.Controller.Entities
/// The date modified.
public DateTime DateModified { get; set; }
+ ///
+ /// Gets or sets a value indicating whether this instance is placeholder.
+ ///
+ /// true if this instance is placeholder; otherwise, false.
+ public bool IsPlaceholder { get; set; }
+
[IgnoreDataMember]
public bool IsLocalFile
{
diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
index a4710bec47..9932df2bc6 100644
--- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs
+++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
@@ -130,7 +130,7 @@ namespace MediaBrowser.Providers.Manager
{
if (!IsEnabled(savedOptions, imageType, item)) continue;
- if (!item.HasImage(imageType) || (refreshOptions.IsReplacingImage(imageType) && !downloadedImages.Contains(imageType)))
+ if (!HasImage(item, imageType) || (refreshOptions.IsReplacingImage(imageType) && !downloadedImages.Contains(imageType)))
{
_logger.Debug("Running {0} for {1}", provider.GetType().Name, item.Path ?? item.Name);
@@ -199,6 +199,14 @@ namespace MediaBrowser.Providers.Manager
ImageType.Thumb
};
+ private bool HasImage(IHasImages item, ImageType type)
+ {
+ var image = item.GetImageInfo(type, 0);
+
+ // if it's a placeholder image then pretend like it's not there so that we can replace it
+ return image != null && !image.IsPlaceholder;
+ }
+
///
/// Determines if an item already contains the given images
///
@@ -210,7 +218,7 @@ namespace MediaBrowser.Providers.Manager
/// true if the specified item contains images; otherwise, false.
private bool ContainsImages(IHasImages item, List images, MetadataOptions savedOptions, int backdropLimit, int screenshotLimit)
{
- if (_singularImages.Any(i => images.Contains(i) && !item.HasImage(i) && savedOptions.GetLimit(i) > 0))
+ if (_singularImages.Any(i => images.Contains(i) && !HasImage(item, i) && savedOptions.GetLimit(i) > 0))
{
return false;
}
@@ -282,7 +290,7 @@ namespace MediaBrowser.Providers.Manager
{
if (!IsEnabled(savedOptions, imageType, item)) continue;
- if (!item.HasImage(imageType) || (refreshOptions.IsReplacingImage(imageType) && !downloadedImages.Contains(imageType)))
+ if (!HasImage(item, imageType) || (refreshOptions.IsReplacingImage(imageType) && !downloadedImages.Contains(imageType)))
{
minWidth = savedOptions.GetMinWidth(imageType);
var downloaded = await DownloadImage(item, provider, result, list, minWidth, imageType, cancellationToken).ConfigureAwait(false);
@@ -613,4 +621,4 @@ namespace MediaBrowser.Providers.Manager
}
}
}
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index e4a7683d69..7a0397a2d3 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -653,13 +653,26 @@ namespace MediaBrowser.Server.Implementations.LiveTv
item.IndexNumber = info.EpisodeNumber;
item.ParentIndexNumber = info.SeasonNumber;
- if (!string.IsNullOrWhiteSpace(info.ImagePath))
- {
- item.SetImagePath(ImageType.Primary, info.ImagePath);
- }
- else if (!string.IsNullOrWhiteSpace(info.ImageUrl))
+ if (!item.HasImage(ImageType.Primary))
{
- item.SetImagePath(ImageType.Primary, info.ImageUrl);
+ if (!string.IsNullOrWhiteSpace(info.ImagePath))
+ {
+ item.SetImage(new ItemImageInfo
+ {
+ Path = info.ImagePath,
+ Type = ImageType.Primary,
+ IsPlaceholder = true
+ }, 0);
+ }
+ else if (!string.IsNullOrWhiteSpace(info.ImageUrl))
+ {
+ item.SetImage(new ItemImageInfo
+ {
+ Path = info.ImageUrl,
+ Type = ImageType.Primary,
+ IsPlaceholder = true
+ }, 0);
+ }
}
if (isNew)