3 files changed, 20 insertions, 23 deletions
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 5905c25a5..f34e3d68d 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -429,10 +429,16 @@ namespace MediaBrowser.Controller.Library
         /// Gets the collection folders.
         /// </summary>
         /// <param name="item">The item.</param>
-        /// <returns>IEnumerable&lt;Folder&gt;.</returns>
+        /// <returns>The folders that contain the item.</returns>
         List<Folder> GetCollectionFolders(BaseItem item);
 
-        List<Folder> GetCollectionFolders(BaseItem item, List<Folder> allUserRootChildren);
+        /// <summary>
+        /// Gets the collection folders.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="allUserRootChildren">The root folders to consider.</param>
+        /// <returns>The folders that contain the item.</returns>
+        List<Folder> GetCollectionFolders(BaseItem item, IEnumerable<Folder> allUserRootChildren);
 
         LibraryOptions GetLibraryOptions(BaseItem item);
 
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index 91d162b41..01986d303 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -47,7 +47,7 @@ namespace MediaBrowser.Controller.Library
 
         public LibraryOptions LibraryOptions
         {
-            get => _libraryOptions ??= Parent == null ? new LibraryOptions() : BaseItem.LibraryManager.GetLibraryOptions(Parent);
+            get => _libraryOptions ??= Parent is null ? new LibraryOptions() : BaseItem.LibraryManager.GetLibraryOptions(Parent);
             set => _libraryOptions = value;
         }
 
@@ -119,7 +119,7 @@ namespace MediaBrowser.Controller.Library
             get
             {
                 var paths = string.IsNullOrEmpty(Path) ? Array.Empty<string>() : new[] { Path };
-                return AdditionalLocations == null ? paths : paths.Concat(AdditionalLocations).ToArray();
+                return AdditionalLocations is null ? paths : paths.Concat(AdditionalLocations).ToArray();
             }
         }
 
@@ -130,13 +130,13 @@ namespace MediaBrowser.Controller.Library
         {
             var parent = Parent;
 
-            if (parent != null)
+            if (parent is not null)
             {
                 var item = parent as T;
 
                 // Just in case the user decided to nest episodes.
                 // Not officially supported but in some cases we can handle it.
-                if (item == null)
+                if (item is null)
                 {
                     var parents = parent.GetParents();
                     foreach (var currentParent in parents)
@@ -148,7 +148,7 @@ namespace MediaBrowser.Controller.Library
                     }
                 }
 
-                return item != null;
+                return item is not null;
             }
 
             return false;
@@ -171,10 +171,7 @@ namespace MediaBrowser.Controller.Library
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <c>null</c> or empty.</exception>
         public void AddAdditionalLocation(string path)
         {
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentException("The path was empty or null.", nameof(path));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(path);
 
             AdditionalLocations ??= new List<string>();
             AdditionalLocations.Add(path);
@@ -190,10 +187,7 @@ namespace MediaBrowser.Controller.Library
         /// <exception cref="ArgumentNullException"><paramref name="name"/> is <c>null</c> or empty.</exception>
         public FileSystemMetadata GetFileSystemEntryByName(string name)
         {
-            if (string.IsNullOrEmpty(name))
-            {
-                throw new ArgumentException("The name was empty or null.", nameof(name));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(name);
 
             return GetFileSystemEntryByPath(System.IO.Path.Combine(Path, name));
         }
@@ -206,10 +200,7 @@ namespace MediaBrowser.Controller.Library
         /// <exception cref="ArgumentNullException">Throws if path is invalid.</exception>
         public FileSystemMetadata GetFileSystemEntryByPath(string path)
         {
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentException("The path was empty or null.", nameof(path));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(path);
 
             foreach (var file in FileSystemChildren)
             {
@@ -287,14 +278,14 @@ namespace MediaBrowser.Controller.Library
         /// <returns><c>true</c> if the arguments are the same, <c>false</c> otherwise.</returns>
         protected bool Equals(ItemResolveArgs args)
         {
-            if (args != null)
+            if (args is not null)
             {
-                if (args.Path == null && Path == null)
+                if (args.Path is null && Path is null)
                 {
                     return true;
                 }
 
-                return args.Path != null && BaseItem.FileSystem.AreEqual(args.Path, Path);
+                return args.Path is not null && BaseItem.FileSystem.AreEqual(args.Path, Path);
             }
 
             return false;
diff --git a/MediaBrowser.Controller/Library/NameExtensions.cs b/MediaBrowser.Controller/Library/NameExtensions.cs
index 9d78b8b6c..919570e89 100644
--- a/MediaBrowser.Controller/Library/NameExtensions.cs
+++ b/MediaBrowser.Controller/Library/NameExtensions.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Controller.Library
 
         private static string RemoveDiacritics(string? name)
         {
-            if (name == null)
+            if (name is null)
             {
                 return string.Empty;
             }