From 74459ec403eda3912f12122da18c15c96244d351 Mon Sep 17 00:00:00 2001 From: "Petrus.Z" Date: Tue, 16 Nov 2021 11:38:36 +0800 Subject: [PATCH] Fix issues mentioned in review Signed-off-by: Petrus.Z --- .../Validators/CollectionPostScanTask.cs | 115 +++++++++++- .../Library/Validators/CollectionValidator.cs | 166 ------------------ 2 files changed, 110 insertions(+), 171 deletions(-) delete mode 100644 Emby.Server.Implementations/Library/Validators/CollectionValidator.cs diff --git a/Emby.Server.Implementations/Library/Validators/CollectionPostScanTask.cs b/Emby.Server.Implementations/Library/Validators/CollectionPostScanTask.cs index bc204b788b..64967350ef 100644 --- a/Emby.Server.Implementations/Library/Validators/CollectionPostScanTask.cs +++ b/Emby.Server.Implementations/Library/Validators/CollectionPostScanTask.cs @@ -1,9 +1,14 @@ using System; +using System.Linq; using System.Threading; using System.Threading.Tasks; +using System.Collections.Generic; using MediaBrowser.Controller.Collections; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Library; -using MediaBrowser.Controller.Persistence; +using MediaBrowser.Model.Querying; +using Jellyfin.Data.Enums; using Microsoft.Extensions.Logging; namespace Emby.Server.Implementations.Library.Validators @@ -17,8 +22,16 @@ namespace Emby.Server.Implementations.Library.Validators /// The _library manager. /// private readonly ILibraryManager _libraryManager; + + /// + /// The collection manager. + /// private readonly ICollectionManager _collectionManager; - private readonly ILogger _logger; + + /// + /// The logger. + /// + private readonly ILogger _logger; /// /// Initializes a new instance of the class. @@ -28,7 +41,7 @@ namespace Emby.Server.Implementations.Library.Validators /// The logger. public CollectionPostScanTask( ILibraryManager libraryManager, - ILogger logger, + ILogger logger, ICollectionManager collectionManager) { _libraryManager = libraryManager; @@ -42,9 +55,101 @@ namespace Emby.Server.Implementations.Library.Validators /// The progress. /// The cancellation token. /// Task. - public Task Run(IProgress progress, CancellationToken cancellationToken) + public async Task Run(IProgress progress, CancellationToken cancellationToken) { - return new CollectionValidator(_libraryManager, _collectionManager, _logger).Run(progress, cancellationToken); + + var movies = _libraryManager.GetItemList(new InternalItemsQuery + { + IncludeItemTypes = new[] { nameof(Movie) }, + IsVirtualItem = false, + OrderBy = new List> + { + new ValueTuple(ItemSortBy.SortName, SortOrder.Ascending) + }, + Recursive = true + }); + + var boxSets = _libraryManager.GetItemList(new InternalItemsQuery + { + IncludeItemTypes = new[] { nameof(BoxSet) }, + CollapseBoxSetItems = false, + Recursive = true + }); + + var numComplete = 0; + var count = movies.Count; + + var collectionNameMoviesMap = new Dictionary>(); + foreach (var m in movies) + { + var movie = m as Movie; + if (movie != null && movie.CollectionName != null) + { + var movieList = new List(); + if (collectionNameMoviesMap.TryGetValue(movie.CollectionName, out movieList)) + { + if (!movieList.Any(m => m.Id == movie.Id)) + { + movieList.Add(movie); + collectionNameMoviesMap[movie.CollectionName] = movieList; + } + } + else + { + collectionNameMoviesMap[movie.CollectionName] = new List { movie }; + } + + } + + numComplete++; + double percent = numComplete; + percent /= count * 2; + percent *= 100; + + progress.Report(percent); + } + + foreach (var pair in collectionNameMoviesMap) + { + try + { + var collectionName = pair.Key; + var movieList = pair.Value; + + var boxSet = boxSets.FirstOrDefault(b => b != null ? b.Name == collectionName : false) as BoxSet; + if (boxSet == null) + { + // won't automatically create collection if only one movie in it + if (movieList.Count >= 2) + { + boxSet = await _collectionManager.CreateCollectionAsync(new CollectionCreationOptions + { + Name = collectionName, + IsLocked = true + }); + + await _collectionManager.AddToCollectionAsync(boxSet.Id, movieList.Select(m => m.Id)); + } + } + else + { + await _collectionManager.AddToCollectionAsync(boxSet.Id, movieList.Select(m => m.Id)); + } + + numComplete++; + double percent = numComplete; + percent /= count * 2; + percent *= 100; + + progress.Report(percent); + } + catch (Exception ex) + { + _logger.LogError(ex, "Error refreshing {0}, {1}", pair.Key, pair.Value.ToString()); + } + } + + progress.Report(100); } } } diff --git a/Emby.Server.Implementations/Library/Validators/CollectionValidator.cs b/Emby.Server.Implementations/Library/Validators/CollectionValidator.cs deleted file mode 100644 index 439fc1da10..0000000000 --- a/Emby.Server.Implementations/Library/Validators/CollectionValidator.cs +++ /dev/null @@ -1,166 +0,0 @@ -using System; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using System.Collections.Generic; -using MediaBrowser.Controller.Collections; -using MediaBrowser.Controller.Entities; -using MediaBrowser.Controller.Entities.Movies; -using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Querying; -using Microsoft.Extensions.Logging; -using Jellyfin.Data.Enums; - -namespace Emby.Server.Implementations.Library.Validators -{ - /// - /// Class CollectionValidator. - /// - public class CollectionValidator - { - /// - /// The library manager. - /// - private readonly ILibraryManager _libraryManager; - - /// - /// The collection manager. - /// - private readonly ICollectionManager _collectionManager; - - /// - /// The logger. - /// - private readonly ILogger _logger; - - /// - /// Initializes a new instance of the class. - /// - /// The library manager. - /// The collection manager. - /// The logger. - public CollectionValidator(ILibraryManager libraryManager, ICollectionManager collectionManager, ILogger logger) - { - _libraryManager = libraryManager; - _collectionManager = collectionManager; - _logger = logger; - } - - /// - /// Runs the specified progress. - /// - /// The progress. - /// The cancellation token. - /// Task. - public async Task Run(IProgress progress, CancellationToken cancellationToken) - { - var movies = _libraryManager.GetItemList(new InternalItemsQuery - { - IncludeItemTypes = new[] { nameof(Movie) }, - IsVirtualItem = false, - OrderBy = new List> - { - new ValueTuple(ItemSortBy.SortName, SortOrder.Ascending) - }, - Recursive = true - }).Select(m => m as Movie).ToList(); - - var boxSets = _libraryManager.GetItemList(new InternalItemsQuery - { - IncludeItemTypes = new[] { nameof(BoxSet) }, - CollapseBoxSetItems = false, - Recursive = true - }).Select(b => b as BoxSet).ToList(); - - var numComplete = 0; - var count = movies.Count; - - var map = new Dictionary>(); - foreach (var movie in movies) - { - if (movie != null && movie.CollectionName != null) - { - var movieList = new List(); - if (map.TryGetValue(movie.CollectionName, out movieList)) - { - if (!movieList.Where(m => m.Id == movie.Id).Any()) - { - movieList.Add(movie); - map[movie.CollectionName] = movieList; - } - } - else - { - map[movie.CollectionName] = new List { movie }; - } - - } - - numComplete++; - double percent = numComplete; - percent /= count * 2; - percent *= 100; - - progress.Report(percent); - } - - foreach (var pair in map) - { - try - { - var collectionName = pair.Key; - var movieList = pair.Value; - - var boxSet = boxSets.FirstOrDefault(b => b != null ? b.Name == collectionName : false); - if (boxSet == null) - { - // won't automatically create collection if only one movie in it - if (movieList.Count >= 2) - { - boxSet = await _collectionManager.CreateCollectionAsync(new CollectionCreationOptions - { - Name = collectionName, - IsLocked = true - }); - - AddMovieToCollection(boxSet.Id, boxSet, movieList); - } - } - else - { - AddMovieToCollection(boxSet.Id, boxSet, movieList); - } - - numComplete++; - double percent = numComplete; - percent /= count * 2; - percent *= 100; - - progress.Report(percent); - } - catch (Exception ex) - { - _logger.LogError(ex, "Error refreshing {0}, {1}", pair.Key, pair.Value.ToString()); - } - } - - progress.Report(100); - } - - private async void AddMovieToCollection(Guid boxSetId, BoxSet boxSet, List movieList) - { - - var movieIds = new List(); - foreach (var movie in movieList) - { - if (!boxSet.ContainsLinkedChildByItemId(movie.Id)) - { - movieIds.Add(movie.Id); - } - } - if (movieIds.Any()) { - await _collectionManager.AddToCollectionAsync(boxSetId, movieIds); - } - } - } -}