Merge branch 'master' into keyframe_extraction_v1

# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs
#	MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
#	MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

1 files changed, 59 insertions, 0 deletions

diff --git a/Emby.Server.Implementations/Playlists/PlaylistsFolder.cs b/Emby.Server.Implementations/Playlists/PlaylistsFolder.cs
new file mode 100644
index 000000000..8ec9f6161
--- /dev/null
+++ b/Emby.Server.Implementations/Playlists/PlaylistsFolder.cs
@@ -0,0 +1,59 @@
+#pragma warning disable CS1591
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+using Jellyfin.Data.Entities;
+using Jellyfin.Data.Enums;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Model.Querying;
+
+namespace Emby.Server.Implementations.Playlists
+{
+    public class PlaylistsFolder : BasePluginFolder
+    {
+        public PlaylistsFolder()
+        {
+            Name = "Playlists";
+        }
+
+        [JsonIgnore]
+        public override bool IsHidden => true;
+
+        [JsonIgnore]
+        public override bool SupportsInheritedParentImages => false;
+
+        [JsonIgnore]
+        public override string CollectionType => MediaBrowser.Model.Entities.CollectionType.Playlists;
+
+        public override bool IsVisible(User user)
+        {
+            return base.IsVisible(user) && GetChildren(user, true).Any();
+        }
+
+        protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
+        {
+            return base.GetEligibleChildrenForRecursiveChildren(user).OfType<Playlist>();
+        }
+
+        protected override QueryResult<BaseItem> GetItemsInternal(InternalItemsQuery query)
+        {
+            if (query.User == null)
+            {
+                query.Recursive = false;
+                return base.GetItemsInternal(query);
+            }
+
+            query.Recursive = true;
+            query.IncludeItemTypes = new[] { BaseItemKind.Playlist };
+            query.Parent = null;
+            return LibraryManager.GetItemsResult(query);
+        }
+
+        public override string GetClientTypeName()
+        {
+            return "ManualPlaylistsFolder";
+        }
+    }
+}