Merge branch 'master' into userdb-efcore

# Conflicts:
#	Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
#	Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
#	Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
#	Emby.Server.Implementations/TV/TVSeriesManager.cs
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs

1 files changed, 0 insertions, 98 deletions

diff --git a/Emby.Server.Implementations/UserViews/CollectionFolderImageProvider.cs b/Emby.Server.Implementations/UserViews/CollectionFolderImageProvider.cs
deleted file mode 100644
index a3f3f6cb4..000000000
--- a/Emby.Server.Implementations/UserViews/CollectionFolderImageProvider.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Emby.Server.Implementations.Images;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Dto;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Querying;
-
-namespace Emby.Server.Implementations.UserViews
-{
-    public class CollectionFolderImageProvider : BaseDynamicImageProvider<CollectionFolder>
-    {
-        public CollectionFolderImageProvider(IFileSystem fileSystem, IProviderManager providerManager, IApplicationPaths applicationPaths, IImageProcessor imageProcessor) : base(fileSystem, providerManager, applicationPaths, imageProcessor)
-        {
-        }
-
-        protected override IReadOnlyList<BaseItem> GetItemsWithImages(BaseItem item)
-        {
-            var view = (CollectionFolder)item;
-            var viewType = view.CollectionType;
-
-            string[] includeItemTypes;
-
-            if (string.Equals(viewType, CollectionType.Movies))
-            {
-                includeItemTypes = new string[] { "Movie" };
-            }
-            else if (string.Equals(viewType, CollectionType.TvShows))
-            {
-                includeItemTypes = new string[] { "Series" };
-            }
-            else if (string.Equals(viewType, CollectionType.Music))
-            {
-                includeItemTypes = new string[] { "MusicAlbum" };
-            }
-            else if (string.Equals(viewType, CollectionType.Books))
-            {
-                includeItemTypes = new string[] { "Book", "AudioBook" };
-            }
-            else if (string.Equals(viewType, CollectionType.BoxSets))
-            {
-                includeItemTypes = new string[] { "BoxSet" };
-            }
-            else if (string.Equals(viewType, CollectionType.HomeVideos) || string.Equals(viewType, CollectionType.Photos))
-            {
-                includeItemTypes = new string[] { "Video", "Photo" };
-            }
-            else
-            {
-                includeItemTypes = new string[] { "Video", "Audio", "Photo", "Movie", "Series" };
-            }
-
-            var recursive = !string.Equals(CollectionType.Playlists, viewType, StringComparison.OrdinalIgnoreCase);
-
-            return view.GetItemList(new InternalItemsQuery
-            {
-                CollapseBoxSetItems = false,
-                Recursive = recursive,
-                DtoOptions = new DtoOptions(false),
-                ImageTypes = new ImageType[] { ImageType.Primary },
-                Limit = 8,
-                OrderBy = new ValueTuple<string, SortOrder>[]
-                {
-                    new ValueTuple<string, SortOrder>(ItemSortBy.Random, SortOrder.Ascending)
-                },
-                IncludeItemTypes = includeItemTypes
-
-            });
-        }
-
-        protected override bool Supports(BaseItem item)
-        {
-            return item is CollectionFolder;
-        }
-
-        protected override string CreateImage(BaseItem item, IReadOnlyCollection<BaseItem> itemsWithImages, string outputPathWithoutExtension, ImageType imageType, int imageIndex)
-        {
-            var outputPath = Path.ChangeExtension(outputPathWithoutExtension, ".png");
-
-            if (imageType == ImageType.Primary)
-            {
-                if (itemsWithImages.Count == 0)
-                {
-                    return null;
-                }
-
-                return CreateThumbCollage(item, itemsWithImages, outputPath, 960, 540);
-            }
-
-            return base.CreateImage(item, itemsWithImages, outputPath, imageType, imageIndex);
-        }
-    }
-}