Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-23 15:30:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use List<Gid> instead of List<Movie>

Browse Source 
Signed-off-by: Petrus.Z <silencly07@gmail.com>
This commit is contained in:
Petrus.Z 2021-11-17 22:18:59 +08:00
parent 52e9dc66f5
commit c09e999916
No known key found for this signature in database
GPG Key ID: 71B321E14F898C3D
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Emby.Server.Implementations/Library/Validators/CollectionPostScanTask.cs
View File

@ -54,7 +54,7 @@ namespace Emby.Server.Implementations.Library.Validators
Recursive = true Recursive = true
}); });
var collectionNameMoviesMap = new Dictionary<string, List<Movie>>(); var collectionNameMoviesMap = new Dictionary<string, List<Guid>>();
foreach (var library in _libraryManager.RootFolder.Children.ToList()) { foreach (var library in _libraryManager.RootFolder.Children.ToList()) {
if (!_libraryManager.GetLibraryOptions(library).AutoCollection) { if (!_libraryManager.GetLibraryOptions(library).AutoCollection) {
@ -78,14 +78,14 @@ namespace Emby.Server.Implementations.Library.Validators
{ {
if (collectionNameMoviesMap.TryGetValue(movie.CollectionName, out var movieList)) if (collectionNameMoviesMap.TryGetValue(movie.CollectionName, out var movieList))
{ {
if (!movieList.Any(m => m.Id == movie.Id)) if (!movieList.Any(m => m == movie.Id))
{ {
movieList.Add(movie); movieList.Add(movie.Id);
} }
} }
else else
{ {
collectionNameMoviesMap[movie.CollectionName] = new List<Movie> { movie }; collectionNameMoviesMap[movie.CollectionName] = new List<Guid> { movie.Id };
} }
} }
} }
@ -94,7 +94,7 @@ namespace Emby.Server.Implementations.Library.Validators
var numComplete = 0; var numComplete = 0;
var count = collectionNameMoviesMap.Count; var count = collectionNameMoviesMap.Count;
foreach (var (collectionName, movieList) in collectionNameMoviesMap) foreach (var (collectionName, movieIds) in collectionNameMoviesMap)
{ {
try try
{ {
@ -102,7 +102,7 @@ namespace Emby.Server.Implementations.Library.Validators
if (boxSet == null) if (boxSet == null)
{ {
// won't automatically create collection if only one movie in it // won't automatically create collection if only one movie in it
if (movieList.Count >= 2) if (movieIds.Count >= 2)
{ {
boxSet = await _collectionManager.CreateCollectionAsync(new CollectionCreationOptions boxSet = await _collectionManager.CreateCollectionAsync(new CollectionCreationOptions
{ {
@ -110,12 +110,12 @@ namespace Emby.Server.Implementations.Library.Validators
IsLocked = true IsLocked = true
}); });
await _collectionManager.AddToCollectionAsync(boxSet.Id, movieList.Select(m => m.Id)); await _collectionManager.AddToCollectionAsync(boxSet.Id, movieIds);
} }
} }
else else
{ {
await _collectionManager.AddToCollectionAsync(boxSet.Id, movieList.Select(m => m.Id)); await _collectionManager.AddToCollectionAsync(boxSet.Id, movieIds);
} }
numComplete++; numComplete++;
@ -127,7 +127,7 @@ namespace Emby.Server.Implementations.Library.Validators
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Error refreshing {CollectionName} with {@MovieIds}", collectionName, movieList); _logger.LogError(ex, "Error refreshing {CollectionName} with {@MovieIds}", collectionName, movieIds);
} }
} }