pt/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-09-05 21:37:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve performance

Browse Source 
Signed-off-by: Petrus.Z <silencly07@gmail.com>
This commit is contained in:
Petrus.Z 2021-11-17 20:56:14 +08:00
parent 0a0ddb0eaf
commit 3c8f7d380f
No known key found for this signature in database
GPG Key ID: 71B321E14F898C3D
1 changed files with 43 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Querying; using MediaBrowser.Model.Querying;
using Jellyfin.Data.Enums; using Jellyfin.Data.Enums;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System.Diagnostics; using MediaBrowser.Model.Entities;
namespace Emby.Server.Implementations.Library.Validators namespace Emby.Server.Implementations.Library.Validators
{ {
@ -47,14 +47,6 @@ namespace Emby.Server.Implementations.Library.Validators
/// <returns>Task.</returns> /// <returns>Task.</returns>
public async Task Run(IProgress<double> progress, CancellationToken cancellationToken) public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
{ {
var movies = _libraryManager.GetItemList(new InternalItemsQuery
{
IncludeItemTypes = new[] { nameof(Movie) },
IsVirtualItem = false,
OrderBy = new[] { (ItemSortBy.SortName, SortOrder.Ascending) },
Recursive = true
});
var boxSets = _libraryManager.GetItemList(new InternalItemsQuery var boxSets = _libraryManager.GetItemList(new InternalItemsQuery
{ {
IncludeItemTypes = new[] { nameof(BoxSet) }, IncludeItemTypes = new[] { nameof(BoxSet) },
@ -62,36 +54,47 @@ namespace Emby.Server.Implementations.Library.Validators
Recursive = true Recursive = true
}); });
var numComplete = 0;
var count = movies.Count;
var collectionNameMoviesMap = new Dictionary<string, List<Movie>>(); var collectionNameMoviesMap = new Dictionary<string, List<Movie>>();
foreach (var m in movies)
{
if (m is Movie movie && !string.IsNullOrEmpty(movie.CollectionName))
{
if (collectionNameMoviesMap.TryGetValue(movie.CollectionName, out var movieList))
{
if (!movieList.Any(m => m.Id == movie.Id))
{
movieList.Add(movie);
}
}
else
{
collectionNameMoviesMap[movie.CollectionName] = new List<Movie> { movie };
}
foreach (var library in _libraryManager.RootFolder.Children.ToList()) {
if (!_libraryManager.GetLibraryOptions(library).AutoCollection) {
continue;
} }
numComplete++; var movies = _libraryManager.GetItemList(new InternalItemsQuery
double percent = numComplete; {
percent /= count * 2; MediaTypes = new string[] { MediaType.Video },
percent *= 100; IncludeItemTypes = new[] { nameof(Movie) },
IsVirtualItem = false,
OrderBy = new[] { (ItemSortBy.SortName, SortOrder.Ascending) },
SourceTypes = new[] { SourceType.Library },
Parent = library,
Recursive = true
});
progress.Report(percent); foreach (var m in movies)
{
if (m is Movie movie && !string.IsNullOrEmpty(movie.CollectionName))
{
if (collectionNameMoviesMap.TryGetValue(movie.CollectionName, out var movieList))
{
if (!movieList.Any(m => m.Id == movie.Id))
{
movieList.Add(movie);
}
}
else
{
collectionNameMoviesMap[movie.CollectionName] = new List<Movie> { movie };
}
}
}
} }
var numComplete = 0;
var count = collectionNameMoviesMap.Count;
foreach (var (collectionName, movieList) in collectionNameMoviesMap) foreach (var (collectionName, movieList) in collectionNameMoviesMap)
{ {
try try
@ -102,28 +105,23 @@ namespace Emby.Server.Implementations.Library.Validators
// 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 (movieList.Count >= 2)
{ {
var movieIds = FliterMoviesByOption(movieList); boxSet = await _collectionManager.CreateCollectionAsync(new CollectionCreationOptions
if (movieIds.Count >= 2) { {
// at least 2 movies have AutoCollection option enable Name = collectionName,
boxSet = await _collectionManager.CreateCollectionAsync(new CollectionCreationOptions IsLocked = true
{ });
Name = collectionName,
IsLocked = true
});
await _collectionManager.AddToCollectionAsync(boxSet.Id, movieIds); await _collectionManager.AddToCollectionAsync(boxSet.Id, movieList.Select(m => m.Id));
}
} }
} }
else else
{ {
var movieIds = FliterMoviesByOption(movieList); await _collectionManager.AddToCollectionAsync(boxSet.Id, movieList.Select(m => m.Id));
await _collectionManager.AddToCollectionAsync(boxSet.Id, movieIds);
} }
numComplete++; numComplete++;
double percent = numComplete; double percent = numComplete;
percent /= count * 2; percent /= count;
percent *= 100; percent *= 100;
progress.Report(percent); progress.Report(percent);
@ -136,17 +134,5 @@ namespace Emby.Server.Implementations.Library.Validators
progress.Report(100); progress.Report(100);
} }
private List<Guid> FliterMoviesByOption(List<Movie> movieList) {
List<Guid> movieIds = new List<Guid>();
foreach (var movie in movieList)
{
if (_libraryManager.GetLibraryOptions(movie).AutoCollection)
{
movieIds.Add(movie.Id);
}
}
return movieIds;
}
} }
} }