From aef79a796dd029849f3d99c4b59d3652bd83b4a9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 2 Dec 2016 15:10:35 -0500
Subject: update xml parsing

---
 .../UserViews/DynamicImageProvider.cs                        | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'Emby.Server.Implementations/UserViews/DynamicImageProvider.cs')

diff --git a/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs b/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs
index 09b68c8ea..245fe8ebe 100644
--- a/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs
+++ b/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs
@@ -151,17 +151,7 @@ namespace Emby.Server.Implementations.UserViews
             string[] collectionStripViewTypes =
             {
                 CollectionType.Movies,
-                CollectionType.TvShows,
-                CollectionType.Music,
-                CollectionType.Games,
-                CollectionType.Books,
-                CollectionType.MusicVideos,
-                CollectionType.HomeVideos,
-                CollectionType.BoxSets,
-                CollectionType.LiveTv,
-                CollectionType.Playlists,
-                CollectionType.Photos,
-                string.Empty
+                CollectionType.TvShows
             };
 
             return collectionStripViewTypes.Contains(view.ViewType ?? string.Empty);
-- 
cgit v1.2.3


From 4a9c77c32713ed0a52597f9abb7313062ef1872f Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 2 Dec 2016 15:45:11 -0500
Subject: update backdrops

---
 .../Images/BaseDynamicImageProvider.cs                   |  5 +++++
 .../UserViews/DynamicImageProvider.cs                    | 16 +++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'Emby.Server.Implementations/UserViews/DynamicImageProvider.cs')

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);
         }
     }
 }
-- 
cgit v1.2.3