1 files changed, 59 insertions, 50 deletions
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index b1da4d64c..5c9be7337 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 #pragma warning disable CS1591
 
 using System;
@@ -6,6 +8,7 @@ using System.Linq;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Jellyfin.Data.Entities;
+using Jellyfin.Extensions;
 using MediaBrowser.Controller.TV;
 using MediaBrowser.Model.Querying;
 
@@ -13,22 +16,57 @@ namespace MediaBrowser.Controller.Entities
 {
     public class UserView : Folder, IHasCollectionType
     {
-        /// <inheritdoc />
+        private static readonly string[] _viewTypesEligibleForGrouping = new string[]
+        {
+            Model.Entities.CollectionType.Movies,
+            Model.Entities.CollectionType.TvShows,
+            string.Empty
+        };
+
+        private static readonly string[] _originalFolderViewTypes = new string[]
+        {
+            Model.Entities.CollectionType.Books,
+            Model.Entities.CollectionType.MusicVideos,
+            Model.Entities.CollectionType.HomeVideos,
+            Model.Entities.CollectionType.Photos,
+            Model.Entities.CollectionType.Music,
+            Model.Entities.CollectionType.BoxSets
+        };
+
+        public static ITVSeriesManager TVSeriesManager { get; set; }
+
+        /// <summary>
+        /// Gets or sets the view type.
+        /// </summary>
         public string ViewType { get; set; }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Gets or sets the display parent id.
+        /// </summary>
         public new Guid DisplayParentId { get; set; }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
         public Guid? UserId { get; set; }
 
-        public static ITVSeriesManager TVSeriesManager;
-
         /// <inheritdoc />
         [JsonIgnore]
         public string CollectionType => ViewType;
 
         /// <inheritdoc />
+        [JsonIgnore]
+        public override bool SupportsInheritedParentImages => false;
+
+        /// <inheritdoc />
+        [JsonIgnore]
+        public override bool SupportsPlayedStatus => false;
+
+        /// <inheritdoc />
+        [JsonIgnore]
+        public override bool SupportsPeople => false;
+
+        /// <inheritdoc />
         public override IEnumerable<Guid> GetIdsForAncestorQuery()
         {
             if (!DisplayParentId.Equals(Guid.Empty))
@@ -45,17 +83,13 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
-        [JsonIgnore]
-        public override bool SupportsInheritedParentImages => false;
-
-        [JsonIgnore]
-        public override bool SupportsPlayedStatus => false;
-
+        /// <inheritdoc />
         public override int GetChildCount(User user)
         {
             return GetChildren(user, true).Count;
         }
 
+        /// <inheritdoc />
         protected override QueryResult<BaseItem> GetItemsInternal(InternalItemsQuery query)
         {
             var parent = this as Folder;
@@ -69,16 +103,14 @@ namespace MediaBrowser.Controller.Entities
                 parent = LibraryManager.GetItemById(ParentId) as Folder ?? parent;
             }
 
-            return new UserViewBuilder(UserViewManager, LibraryManager, Logger, UserDataManager, TVSeriesManager, ConfigurationManager)
+            return new UserViewBuilder(UserViewManager, LibraryManager, Logger, UserDataManager, TVSeriesManager)
                 .GetUserItems(parent, this, CollectionType, query);
         }
 
+        /// <inheritdoc />
         public override List<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
         {
-            if (query == null)
-            {
-                query = new InternalItemsQuery(user);
-            }
+            query ??= new InternalItemsQuery(user);
 
             query.EnableTotalRecordCount = false;
             var result = GetItemList(query);
@@ -86,16 +118,19 @@ namespace MediaBrowser.Controller.Entities
             return result.ToList();
         }
 
+        /// <inheritdoc />
         public override bool CanDelete()
         {
             return false;
         }
 
+        /// <inheritdoc />
         public override bool IsSaveLocalMetadataEnabled()
         {
             return true;
         }
 
+        /// <inheritdoc />
         public override IEnumerable<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
         {
             query.SetUser(user);
@@ -106,32 +141,26 @@ namespace MediaBrowser.Controller.Entities
             return GetItemList(query);
         }
 
+        /// <inheritdoc />
         protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
         {
             return GetChildren(user, false);
         }
 
-        private static string[] UserSpecificViewTypes = new string[]
-            {
-                Model.Entities.CollectionType.Playlists
-            };
-
         public static bool IsUserSpecific(Folder folder)
         {
-            var collectionFolder = folder as ICollectionFolder;
-
-            if (collectionFolder == null)
+            if (folder is not ICollectionFolder collectionFolder)
             {
                 return false;
             }
 
-            var supportsUserSpecific = folder as ISupportsUserSpecificView;
-            if (supportsUserSpecific != null && supportsUserSpecific.EnableUserSpecificView)
+            if (folder is ISupportsUserSpecificView supportsUserSpecific
+                && supportsUserSpecific.EnableUserSpecificView)
             {
                 return true;
             }
 
-            return UserSpecificViewTypes.Contains(collectionFolder.CollectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase);
+            return string.Equals(Model.Entities.CollectionType.Playlists, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase);
         }
 
         public static bool IsEligibleForGrouping(Folder folder)
@@ -140,39 +169,19 @@ namespace MediaBrowser.Controller.Entities
                     && IsEligibleForGrouping(collectionFolder.CollectionType);
         }
 
-        private static string[] ViewTypesEligibleForGrouping = new string[]
-            {
-                Model.Entities.CollectionType.Movies,
-                Model.Entities.CollectionType.TvShows,
-                string.Empty
-            };
-
         public static bool IsEligibleForGrouping(string viewType)
         {
-            return ViewTypesEligibleForGrouping.Contains(viewType ?? string.Empty, StringComparer.OrdinalIgnoreCase);
+            return _viewTypesEligibleForGrouping.Contains(viewType ?? string.Empty, StringComparison.OrdinalIgnoreCase);
         }
 
-        private static string[] OriginalFolderViewTypes = new string[]
-            {
-                Model.Entities.CollectionType.Books,
-                Model.Entities.CollectionType.MusicVideos,
-                Model.Entities.CollectionType.HomeVideos,
-                Model.Entities.CollectionType.Photos,
-                Model.Entities.CollectionType.Music,
-                Model.Entities.CollectionType.BoxSets
-            };
-
         public static bool EnableOriginalFolder(string viewType)
         {
-            return OriginalFolderViewTypes.Contains(viewType ?? string.Empty, StringComparer.OrdinalIgnoreCase);
+            return _originalFolderViewTypes.Contains(viewType ?? string.Empty, StringComparison.OrdinalIgnoreCase);
         }
 
-        protected override Task ValidateChildrenInternal(IProgress<double> progress, System.Threading.CancellationToken cancellationToken, bool recursive, bool refreshChildMetadata, Providers.MetadataRefreshOptions refreshOptions, Providers.IDirectoryService directoryService)
+        protected override Task ValidateChildrenInternal(IProgress<double> progress, bool recursive, bool refreshChildMetadata, Providers.MetadataRefreshOptions refreshOptions, Providers.IDirectoryService directoryService, System.Threading.CancellationToken cancellationToken)
         {
             return Task.CompletedTask;
         }
-
-        [JsonIgnore]
-        public override bool SupportsPeople => false;
     }
 }