Merge branch 'master' into master

1 files changed, 113 insertions, 127 deletions

diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
index 563e90fbe..f81309560 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
@@ -11,171 +11,157 @@ using MediaBrowser.Controller.Chapters;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Emby.Server.Implementations.ScheduledTasks.Tasks
+namespace Emby.Server.Implementations.ScheduledTasks.Tasks;
+
+/// <summary>
+/// Class ChapterImagesTask.
+/// </summary>
+public class ChapterImagesTask : IScheduledTask
 {
+    private readonly ILogger<ChapterImagesTask> _logger;
+    private readonly ILibraryManager _libraryManager;
+    private readonly IApplicationPaths _appPaths;
+    private readonly IChapterManager _chapterManager;
+    private readonly IFileSystem _fileSystem;
+    private readonly ILocalizationManager _localization;
+
     /// <summary>
-    /// Class ChapterImagesTask.
+    /// Initializes a new instance of the <see cref="ChapterImagesTask" /> class.
     /// </summary>
-    public class ChapterImagesTask : IScheduledTask
+    /// <param name="logger">Instance of the <see cref="ILogger"/> interface.</param>
+    /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
+    /// <param name="appPaths">Instance of the <see cref="IApplicationPaths"/> interface.</param>
+    /// <param name="chapterManager">Instance of the <see cref="IChapterManager"/> interface.</param>
+    /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
+    /// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param>
+    public ChapterImagesTask(
+        ILogger<ChapterImagesTask> logger,
+        ILibraryManager libraryManager,
+        IApplicationPaths appPaths,
+        IChapterManager chapterManager,
+        IFileSystem fileSystem,
+        ILocalizationManager localization)
     {
-        private readonly ILogger<ChapterImagesTask> _logger;
-        private readonly ILibraryManager _libraryManager;
-        private readonly IItemRepository _itemRepo;
-        private readonly IApplicationPaths _appPaths;
-        private readonly IEncodingManager _encodingManager;
-        private readonly IFileSystem _fileSystem;
-        private readonly ILocalizationManager _localization;
-        private readonly IChapterRepository _chapterRepository;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ChapterImagesTask" /> class.
-        /// </summary>
-        /// <param name="logger">Instance of the <see cref="ILogger"/> interface.</param>
-        /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-        /// <param name="itemRepo">Instance of the <see cref="IItemRepository"/> interface.</param>
-        /// <param name="appPaths">Instance of the <see cref="IApplicationPaths"/> interface.</param>
-        /// <param name="encodingManager">Instance of the <see cref="IEncodingManager"/> interface.</param>
-        /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
-        /// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param>
-        /// <param name="chapterRepository">Instance of the <see cref="IChapterRepository"/> interface.</param>
-        public ChapterImagesTask(
-            ILogger<ChapterImagesTask> logger,
-            ILibraryManager libraryManager,
-            IItemRepository itemRepo,
-            IApplicationPaths appPaths,
-            IEncodingManager encodingManager,
-            IFileSystem fileSystem,
-            ILocalizationManager localization,
-            IChapterRepository chapterRepository)
-        {
-            _logger = logger;
-            _libraryManager = libraryManager;
-            _itemRepo = itemRepo;
-            _appPaths = appPaths;
-            _encodingManager = encodingManager;
-            _fileSystem = fileSystem;
-            _localization = localization;
-            _chapterRepository = chapterRepository;
-        }
+        _logger = logger;
+        _libraryManager = libraryManager;
+        _appPaths = appPaths;
+        _chapterManager = chapterManager;
+        _fileSystem = fileSystem;
+        _localization = localization;
+    }
 
-        /// <inheritdoc />
-        public string Name => _localization.GetLocalizedString("TaskRefreshChapterImages");
+    /// <inheritdoc />
+    public string Name => _localization.GetLocalizedString("TaskRefreshChapterImages");
 
-        /// <inheritdoc />
-        public string Description => _localization.GetLocalizedString("TaskRefreshChapterImagesDescription");
+    /// <inheritdoc />
+    public string Description => _localization.GetLocalizedString("TaskRefreshChapterImagesDescription");
 
-        /// <inheritdoc />
-        public string Category => _localization.GetLocalizedString("TasksLibraryCategory");
+    /// <inheritdoc />
+    public string Category => _localization.GetLocalizedString("TasksLibraryCategory");
 
-        /// <inheritdoc />
-        public string Key => "RefreshChapterImages";
+    /// <inheritdoc />
+    public string Key => "RefreshChapterImages";
 
-        /// <inheritdoc />
-        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+    /// <inheritdoc />
+    public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+    {
+        yield return new TaskTriggerInfo
         {
-            return
-            [
-                new TaskTriggerInfo
-                {
-                    Type = TaskTriggerInfoType.DailyTrigger,
-                    TimeOfDayTicks = TimeSpan.FromHours(2).Ticks,
-                    MaxRuntimeTicks = TimeSpan.FromHours(4).Ticks
-                }
-            ];
-        }
+            Type = TaskTriggerInfoType.DailyTrigger,
+            TimeOfDayTicks = TimeSpan.FromHours(2).Ticks,
+            MaxRuntimeTicks = TimeSpan.FromHours(4).Ticks
+        };
+    }
 
-        /// <inheritdoc />
-        public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
+    {
+        var videos = _libraryManager.GetItemList(new InternalItemsQuery
         {
-            var videos = _libraryManager.GetItemList(new InternalItemsQuery
+            MediaTypes = [MediaType.Video],
+            IsFolder = false,
+            Recursive = true,
+            DtoOptions = new DtoOptions(false)
             {
-                MediaTypes = [MediaType.Video],
-                IsFolder = false,
-                Recursive = true,
-                DtoOptions = new DtoOptions(false)
-                {
-                    EnableImages = false
-                },
-                SourceTypes = [SourceType.Library],
-                IsVirtualItem = false
-            })
-            .OfType<Video>()
-            .ToList();
+                EnableImages = false
+            },
+            SourceTypes = [SourceType.Library],
+            IsVirtualItem = false
+        })
+        .OfType<Video>()
+        .ToList();
 
-            var numComplete = 0;
+        var numComplete = 0;
 
-            var failHistoryPath = Path.Combine(_appPaths.CachePath, "chapter-failures.txt");
+        var failHistoryPath = Path.Combine(_appPaths.CachePath, "chapter-failures.txt");
 
-            List<string> previouslyFailedImages;
+        List<string> previouslyFailedImages;
 
-            if (File.Exists(failHistoryPath))
+        if (File.Exists(failHistoryPath))
+        {
+            try
             {
-                try
-                {
-                    previouslyFailedImages = (await File.ReadAllTextAsync(failHistoryPath, cancellationToken).ConfigureAwait(false))
-                        .Split('|', StringSplitOptions.RemoveEmptyEntries)
-                        .ToList();
-                }
-                catch (IOException)
-                {
-                    previouslyFailedImages = new List<string>();
-                }
+                previouslyFailedImages = (await File.ReadAllTextAsync(failHistoryPath, cancellationToken).ConfigureAwait(false))
+                    .Split('|', StringSplitOptions.RemoveEmptyEntries)
+                    .ToList();
             }
-            else
+            catch (IOException)
             {
-                previouslyFailedImages = new List<string>();
+                previouslyFailedImages = [];
             }
+        }
+        else
+        {
+            previouslyFailedImages = [];
+        }
 
-            var directoryService = new DirectoryService(_fileSystem);
-
-            foreach (var video in videos)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
+        var directoryService = new DirectoryService(_fileSystem);
 
-                var key = video.Path + video.DateModified.Ticks;
+        foreach (var video in videos)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
 
-                var extract = !previouslyFailedImages.Contains(key, StringComparison.OrdinalIgnoreCase);
+            var key = video.Path + video.DateModified.Ticks;
 
-                try
-                {
-                    var chapters = _chapterRepository.GetChapters(video.Id);
+            var extract = !previouslyFailedImages.Contains(key, StringComparison.OrdinalIgnoreCase);
 
-                    var success = await _encodingManager.RefreshChapterImages(video, directoryService, chapters, extract, true, cancellationToken).ConfigureAwait(false);
+            try
+            {
+                var chapters = _chapterManager.GetChapters(video.Id);
 
-                    if (!success)
-                    {
-                        previouslyFailedImages.Add(key);
+                var success = await _chapterManager.RefreshChapterImages(video, directoryService, chapters, extract, true, cancellationToken).ConfigureAwait(false);
 
-                        var parentPath = Path.GetDirectoryName(failHistoryPath);
-                        if (parentPath is not null)
-                        {
-                            Directory.CreateDirectory(parentPath);
-                        }
+                if (!success)
+                {
+                    previouslyFailedImages.Add(key);
 
-                        string text = string.Join('|', previouslyFailedImages);
-                        await File.WriteAllTextAsync(failHistoryPath, text, cancellationToken).ConfigureAwait(false);
+                    var parentPath = Path.GetDirectoryName(failHistoryPath);
+                    if (parentPath is not null)
+                    {
+                        Directory.CreateDirectory(parentPath);
                     }
 
-                    numComplete++;
-                    double percent = numComplete;
-                    percent /= videos.Count;
-
-                    progress.Report(100 * percent);
-                }
-                catch (ObjectDisposedException ex)
-                {
-                    // TODO Investigate and properly fix.
-                    _logger.LogError(ex, "Object Disposed");
-                    break;
+                    string text = string.Join('|', previouslyFailedImages);
+                    await File.WriteAllTextAsync(failHistoryPath, text, cancellationToken).ConfigureAwait(false);
                 }
+
+                numComplete++;
+                double percent = numComplete;
+                percent /= videos.Count;
+
+                progress.Report(100 * percent);
+            }
+            catch (ObjectDisposedException ex)
+            {
+                // TODO Investigate and properly fix.
+                _logger.LogError(ex, "Object Disposed");
+                break;
             }
         }
     }