aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-12-02 15:45:11 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-12-02 15:45:11 -0500
commit4a9c77c32713ed0a52597f9abb7313062ef1872f (patch)
tree763c2b36ec470314f4174ae8b3f1e95bd76c2eba
parentaef79a796dd029849f3d99c4b59d3652bd83b4a9 (diff)
update backdrops
-rw-r--r--Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs5
-rw-r--r--Emby.Server.Implementations/UserViews/DynamicImageProvider.cs16
2 files changed, 10 insertions, 11 deletions
diff --git a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
index 5a8be5a49..7a36691df 100644
--- a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
+++ b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
@@ -149,6 +149,11 @@ namespace Emby.Server.Implementations.Images
var mimeType = MimeTypes.GetMimeType(outputPath);
+ if (string.Equals(mimeType, "application/octet-stream", StringComparison.OrdinalIgnoreCase))
+ {
+ mimeType = "image/png";
+ }
+
await ProviderManager.SaveImage(item, outputPath, mimeType, imageType, null, false, cancellationToken).ConfigureAwait(false);
return ItemUpdateType.ImageUpdate;
diff --git a/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs b/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs
index 245fe8ebe..bef964c6f 100644
--- a/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs
+++ b/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs
@@ -159,20 +159,14 @@ namespace Emby.Server.Implementations.UserViews
protected override async Task<string> CreateImage(IHasImages item, List<BaseItem> itemsWithImages, string outputPathWithoutExtension, ImageType imageType, int imageIndex)
{
- var outputPath = Path.ChangeExtension(outputPathWithoutExtension, ".png");
-
- var view = (UserView)item;
- if (imageType == ImageType.Primary && IsUsingCollectionStrip(view))
+ if (itemsWithImages.Count == 0)
{
- if (itemsWithImages.Count == 0)
- {
- return null;
- }
-
- return await CreateThumbCollage(item, itemsWithImages, outputPath, 960, 540).ConfigureAwait(false);
+ return null;
}
- return await base.CreateImage(item, itemsWithImages, outputPath, imageType, imageIndex).ConfigureAwait(false);
+ var outputPath = Path.ChangeExtension(outputPathWithoutExtension, ".png");
+
+ return await CreateThumbCollage(item, itemsWithImages, outputPath, 960, 540).ConfigureAwait(false);
}
}
}