mirror of https://github.com/jellyfin/jellyfin.git
Merge pull request #6850 from PetrusZ/collection-validator
This commit is contained in:
commit
0009e5cc27
|
@ -0,0 +1,156 @@
|
||||||
|
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 Jellyfin.Data.Enums;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using MediaBrowser.Model.Entities;
|
||||||
|
|
||||||
|
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>
|
||||||
|
/// 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <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)
|
||||||
|
{
|
||||||
|
if (!_libraryManager.GetLibraryOptions(library).AutomaticallyAddToCollection)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var startIndex = 0;
|
||||||
|
var pagesize = 1000;
|
||||||
|
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
var movies = _libraryManager.GetItemList(new InternalItemsQuery
|
||||||
|
{
|
||||||
|
MediaTypes = new string[] { MediaType.Video },
|
||||||
|
IncludeItemTypes = new[] { nameof(Movie) },
|
||||||
|
IsVirtualItem = false,
|
||||||
|
OrderBy = new[] { (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 (collectionNameMoviesMap.TryGetValue(movie.CollectionName, out var movieList))
|
||||||
|
{
|
||||||
|
movieList.Add(movie.Id);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
collectionNameMoviesMap[movie.CollectionName] = new HashSet<Guid> { movie.Id };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (movies.Count < pagesize)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
startIndex += pagesize;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var numComplete = 0;
|
||||||
|
var count = collectionNameMoviesMap.Count;
|
||||||
|
|
||||||
|
if (count == 0)
|
||||||
|
{
|
||||||
|
progress.Report(100);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var boxSets = _libraryManager.GetItemList(new InternalItemsQuery
|
||||||
|
{
|
||||||
|
IncludeItemTypes = new[] { nameof(BoxSet) },
|
||||||
|
CollapseBoxSetItems = false,
|
||||||
|
Recursive = true
|
||||||
|
});
|
||||||
|
|
||||||
|
foreach (var (collectionName, movieIds) in collectionNameMoviesMap)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var boxSet = boxSets.FirstOrDefault(b => b?.Name == collectionName) as BoxSet;
|
||||||
|
if (boxSet == null)
|
||||||
|
{
|
||||||
|
// won't automatically create collection if only one movie in it
|
||||||
|
if (movieIds.Count >= 2)
|
||||||
|
{
|
||||||
|
boxSet = await _collectionManager.CreateCollectionAsync(new CollectionCreationOptions
|
||||||
|
{
|
||||||
|
Name = collectionName,
|
||||||
|
IsLocked = true
|
||||||
|
});
|
||||||
|
|
||||||
|
await _collectionManager.AddToCollectionAsync(boxSet.Id, movieIds);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
await _collectionManager.AddToCollectionAsync(boxSet.Id, movieIds);
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -16,6 +16,7 @@ namespace MediaBrowser.Model.Configuration
|
||||||
SkipSubtitlesIfAudioTrackMatches = true;
|
SkipSubtitlesIfAudioTrackMatches = true;
|
||||||
RequirePerfectSubtitleMatch = true;
|
RequirePerfectSubtitleMatch = true;
|
||||||
|
|
||||||
|
AutomaticallyAddToCollection = true;
|
||||||
EnablePhotos = true;
|
EnablePhotos = true;
|
||||||
SaveSubtitlesWithMedia = true;
|
SaveSubtitlesWithMedia = true;
|
||||||
EnableRealtimeMonitor = true;
|
EnableRealtimeMonitor = true;
|
||||||
|
@ -80,6 +81,7 @@ namespace MediaBrowser.Model.Configuration
|
||||||
public bool RequirePerfectSubtitleMatch { get; set; }
|
public bool RequirePerfectSubtitleMatch { get; set; }
|
||||||
|
|
||||||
public bool SaveSubtitlesWithMedia { get; set; }
|
public bool SaveSubtitlesWithMedia { get; set; }
|
||||||
|
public bool AutomaticallyAddToCollection { get; set; }
|
||||||
|
|
||||||
public TypeOptions[] TypeOptions { get; set; }
|
public TypeOptions[] TypeOptions { get; set; }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue