1 files changed, 108 insertions, 110 deletions

diff --git a/Emby.Server.Implementations/Library/Validators/CollectionPostScanTask.cs b/Emby.Server.Implementations/Library/Validators/CollectionPostScanTask.cs
index 89f64ee4f..38631e0de 100644
--- a/Emby.Server.Implementations/Library/Validators/CollectionPostScanTask.cs
+++ b/Emby.Server.Implementations/Library/Validators/CollectionPostScanTask.cs
@@ -4,153 +4,151 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Data.Enums;
+using Jellyfin.Database.Implementations.Enums;
 using MediaBrowser.Controller.Collections;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Querying;
 using Microsoft.Extensions.Logging;
 
-namespace Emby.Server.Implementations.Library.Validators
+namespace Emby.Server.Implementations.Library.Validators;
+
+/// <summary>
+/// Class CollectionPostScanTask.
+/// </summary>
+public class CollectionPostScanTask : ILibraryPostScanTask
 {
+    private readonly ILibraryManager _libraryManager;
+    private readonly ICollectionManager _collectionManager;
+    private readonly ILogger<CollectionPostScanTask> _logger;
+
     /// <summary>
-    /// Class CollectionPostScanTask.
+    /// Initializes a new instance of the <see cref="CollectionPostScanTask" /> class.
     /// </summary>
-    public class CollectionPostScanTask : ILibraryPostScanTask
+    /// <param name="libraryManager">The library manager.</param>
+    /// <param name="collectionManager">The collection manager.</param>
+    /// <param name="logger">The logger.</param>
+    public CollectionPostScanTask(
+        ILibraryManager libraryManager,
+        ICollectionManager collectionManager,
+        ILogger<CollectionPostScanTask> logger)
     {
-        private readonly ILibraryManager _libraryManager;
-        private readonly ICollectionManager _collectionManager;
-        private readonly ILogger<CollectionPostScanTask> _logger;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CollectionPostScanTask" /> class.
-        /// </summary>
-        /// <param name="libraryManager">The library manager.</param>
-        /// <param name="collectionManager">The collection manager.</param>
-        /// <param name="logger">The logger.</param>
-        public CollectionPostScanTask(
-            ILibraryManager libraryManager,
-            ICollectionManager collectionManager,
-            ILogger<CollectionPostScanTask> logger)
-        {
-            _libraryManager = libraryManager;
-            _collectionManager = collectionManager;
-            _logger = logger;
-        }
+        _libraryManager = libraryManager;
+        _collectionManager = collectionManager;
+        _logger = logger;
+    }
 
-        /// <summary>
-        /// Runs the specified progress.
-        /// </summary>
-        /// <param name="progress">The progress.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
-        {
-            var collectionNameMoviesMap = new Dictionary<string, HashSet<Guid>>();
+    /// <summary>
+    /// Runs the specified progress.
+    /// </summary>
+    /// <param name="progress">The progress.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns>Task.</returns>
+    public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
+    {
+        var collectionNameMoviesMap = new Dictionary<string, HashSet<Guid>>();
 
-            foreach (var library in _libraryManager.RootFolder.Children)
+        foreach (var library in _libraryManager.RootFolder.Children)
+        {
+            if (!_libraryManager.GetLibraryOptions(library).AutomaticallyAddToCollection)
             {
-                if (!_libraryManager.GetLibraryOptions(library).AutomaticallyAddToCollection)
-                {
-                    continue;
-                }
+                continue;
+            }
 
-                var startIndex = 0;
-                var pagesize = 1000;
+            var startIndex = 0;
+            var pagesize = 1000;
 
-                while (true)
+            while (true)
+            {
+                var movies = _libraryManager.GetItemList(new InternalItemsQuery
                 {
-                    var movies = _libraryManager.GetItemList(new InternalItemsQuery
-                    {
-                        MediaTypes = new[] { MediaType.Video },
-                        IncludeItemTypes = new[] { BaseItemKind.Movie },
-                        IsVirtualItem = false,
-                        OrderBy = new[] { (ItemSortBy.SortName, SortOrder.Ascending) },
-                        Parent = library,
-                        StartIndex = startIndex,
-                        Limit = pagesize,
-                        Recursive = true
-                    });
-
-                    foreach (var m in movies)
+                    MediaTypes = [MediaType.Video],
+                    IncludeItemTypes = [BaseItemKind.Movie],
+                    IsVirtualItem = false,
+                    OrderBy = [(ItemSortBy.SortName, SortOrder.Ascending)],
+                    Parent = library,
+                    StartIndex = startIndex,
+                    Limit = pagesize,
+                    Recursive = true
+                });
+
+                foreach (var m in movies)
+                {
+                    if (m is Movie movie && !string.IsNullOrEmpty(movie.CollectionName))
                     {
-                        if (m is Movie movie && !string.IsNullOrEmpty(movie.CollectionName))
+                        if (collectionNameMoviesMap.TryGetValue(movie.CollectionName, out var movieList))
                         {
-                            if (collectionNameMoviesMap.TryGetValue(movie.CollectionName, out var movieList))
-                            {
-                                movieList.Add(movie.Id);
-                            }
-                            else
-                            {
-                                collectionNameMoviesMap[movie.CollectionName] = new HashSet<Guid> { movie.Id };
-                            }
+                            movieList.Add(movie.Id);
+                        }
+                        else
+                        {
+                            collectionNameMoviesMap[movie.CollectionName] = new HashSet<Guid> { movie.Id };
                         }
                     }
+                }
 
-                    if (movies.Count < pagesize)
-                    {
-                        break;
-                    }
-
-                    startIndex += pagesize;
+                if (movies.Count < pagesize)
+                {
+                    break;
                 }
+
+                startIndex += pagesize;
             }
+        }
 
-            var numComplete = 0;
-            var count = collectionNameMoviesMap.Count;
+        var numComplete = 0;
+        var count = collectionNameMoviesMap.Count;
 
-            if (count == 0)
-            {
-                progress.Report(100);
-                return;
-            }
+        if (count == 0)
+        {
+            progress.Report(100);
+            return;
+        }
 
-            var boxSets = _libraryManager.GetItemList(new InternalItemsQuery
-            {
-                IncludeItemTypes = new[] { BaseItemKind.BoxSet },
-                CollapseBoxSetItems = false,
-                Recursive = true
-            });
+        var boxSets = _libraryManager.GetItemList(new InternalItemsQuery
+        {
+            IncludeItemTypes = [BaseItemKind.BoxSet],
+            CollapseBoxSetItems = false,
+            Recursive = true
+        });
 
-            foreach (var (collectionName, movieIds) in collectionNameMoviesMap)
+        foreach (var (collectionName, movieIds) in collectionNameMoviesMap)
+        {
+            try
             {
-                try
+                var boxSet = boxSets.FirstOrDefault(b => b?.Name == collectionName) as BoxSet;
+                if (boxSet is null)
                 {
-                    var boxSet = boxSets.FirstOrDefault(b => b?.Name == collectionName) as BoxSet;
-                    if (boxSet is null)
+                    // won't automatically create collection if only one movie in it
+                    if (movieIds.Count >= 2)
                     {
-                        // won't automatically create collection if only one movie in it
-                        if (movieIds.Count >= 2)
+                        boxSet = await _collectionManager.CreateCollectionAsync(new CollectionCreationOptions
                         {
-                            boxSet = await _collectionManager.CreateCollectionAsync(new CollectionCreationOptions
-                            {
-                                Name = collectionName,
-                                IsLocked = true
-                            });
+                            Name = collectionName,
+                            IsLocked = true
+                        }).ConfigureAwait(false);
 
-                            await _collectionManager.AddToCollectionAsync(boxSet.Id, movieIds);
-                        }
+                        await _collectionManager.AddToCollectionAsync(boxSet.Id, movieIds).ConfigureAwait(false);
                     }
-                    else
-                    {
-                        await _collectionManager.AddToCollectionAsync(boxSet.Id, movieIds);
-                    }
-
-                    numComplete++;
-                    double percent = numComplete;
-                    percent /= count;
-                    percent *= 100;
-
-                    progress.Report(percent);
                 }
-                catch (Exception ex)
+                else
                 {
-                    _logger.LogError(ex, "Error refreshing {CollectionName} with {@MovieIds}", collectionName, movieIds);
+                    await _collectionManager.AddToCollectionAsync(boxSet.Id, movieIds).ConfigureAwait(false);
                 }
-            }
 
-            progress.Report(100);
+                numComplete++;
+                double percent = numComplete;
+                percent /= count;
+                percent *= 100;
+
+                progress.Report(percent);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error refreshing {CollectionName} with {@MovieIds}", collectionName, movieIds);
+            }
         }
+
+        progress.Report(100);
     }
 }