Merge branch 'master' into master

1 files changed, 101 insertions, 102 deletions

diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
index ff295d9b7..0e77f0102 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
@@ -11,134 +11,133 @@ 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>
+/// Deletes old cache files.
+/// </summary>
+public class DeleteCacheFileTask : IScheduledTask, IConfigurableScheduledTask
 {
     /// <summary>
-    /// Deletes old cache files.
+    /// Gets or sets the application paths.
+    /// </summary>
+    /// <value>The application paths.</value>
+    private readonly IApplicationPaths _applicationPaths;
+    private readonly ILogger<DeleteCacheFileTask> _logger;
+    private readonly IFileSystem _fileSystem;
+    private readonly ILocalizationManager _localization;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DeleteCacheFileTask" /> class.
     /// </summary>
-    public class DeleteCacheFileTask : IScheduledTask, IConfigurableScheduledTask
+    /// <param name="appPaths">Instance of the <see cref="IApplicationPaths"/> interface.</param>
+    /// <param name="logger">Instance of the <see cref="ILogger"/> 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 DeleteCacheFileTask(
+        IApplicationPaths appPaths,
+        ILogger<DeleteCacheFileTask> logger,
+        IFileSystem fileSystem,
+        ILocalizationManager localization)
     {
-        /// <summary>
-        /// Gets or sets the application paths.
-        /// </summary>
-        /// <value>The application paths.</value>
-        private readonly IApplicationPaths _applicationPaths;
-        private readonly ILogger<DeleteCacheFileTask> _logger;
-        private readonly IFileSystem _fileSystem;
-        private readonly ILocalizationManager _localization;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DeleteCacheFileTask" /> class.
-        /// </summary>
-        /// <param name="appPaths">Instance of the <see cref="IApplicationPaths"/> interface.</param>
-        /// <param name="logger">Instance of the <see cref="ILogger"/> 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 DeleteCacheFileTask(
-            IApplicationPaths appPaths,
-            ILogger<DeleteCacheFileTask> logger,
-            IFileSystem fileSystem,
-            ILocalizationManager localization)
-        {
-            _applicationPaths = appPaths;
-            _logger = logger;
-            _fileSystem = fileSystem;
-            _localization = localization;
-        }
+        _applicationPaths = appPaths;
+        _logger = logger;
+        _fileSystem = fileSystem;
+        _localization = localization;
+    }
 
-        /// <inheritdoc />
-        public string Name => _localization.GetLocalizedString("TaskCleanCache");
+    /// <inheritdoc />
+    public string Name => _localization.GetLocalizedString("TaskCleanCache");
 
-        /// <inheritdoc />
-        public string Description => _localization.GetLocalizedString("TaskCleanCacheDescription");
+    /// <inheritdoc />
+    public string Description => _localization.GetLocalizedString("TaskCleanCacheDescription");
 
-        /// <inheritdoc />
-        public string Category => _localization.GetLocalizedString("TasksMaintenanceCategory");
+    /// <inheritdoc />
+    public string Category => _localization.GetLocalizedString("TasksMaintenanceCategory");
 
-        /// <inheritdoc />
-        public string Key => "DeleteCacheFiles";
+    /// <inheritdoc />
+    public string Key => "DeleteCacheFiles";
 
-        /// <inheritdoc />
-        public bool IsHidden => false;
+    /// <inheritdoc />
+    public bool IsHidden => false;
 
-        /// <inheritdoc />
-        public bool IsEnabled => true;
+    /// <inheritdoc />
+    public bool IsEnabled => true;
 
-        /// <inheritdoc />
-        public bool IsLogged => true;
+    /// <inheritdoc />
+    public bool IsLogged => true;
 
-        /// <inheritdoc />
-        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+    /// <inheritdoc />
+    public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+    {
+        yield return new TaskTriggerInfo
         {
-            return
-            [
-                // Every so often
-                new TaskTriggerInfo { Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(24).Ticks }
-            ];
-        }
+            Type = TaskTriggerInfoType.IntervalTrigger,
+            IntervalTicks = TimeSpan.FromHours(24).Ticks
+        };
+    }
 
-        /// <inheritdoc />
-        public Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
+    {
+        var minDateModified = DateTime.UtcNow.AddDays(-30);
+
+        try
+        {
+            DeleteCacheFilesFromDirectory(_applicationPaths.CachePath, minDateModified, progress, cancellationToken);
+        }
+        catch (DirectoryNotFoundException)
         {
-            var minDateModified = DateTime.UtcNow.AddDays(-30);
-
-            try
-            {
-                DeleteCacheFilesFromDirectory(_applicationPaths.CachePath, minDateModified, progress, cancellationToken);
-            }
-            catch (DirectoryNotFoundException)
-            {
-                // No biggie here. Nothing to delete
-            }
-
-            progress.Report(90);
-
-            minDateModified = DateTime.UtcNow.AddDays(-1);
-
-            try
-            {
-                DeleteCacheFilesFromDirectory(_applicationPaths.TempDirectory, minDateModified, progress, cancellationToken);
-            }
-            catch (DirectoryNotFoundException)
-            {
-                // No biggie here. Nothing to delete
-            }
-
-            return Task.CompletedTask;
+            // No biggie here. Nothing to delete
         }
 
-        /// <summary>
-        /// Deletes the cache files from directory with a last write time less than a given date.
-        /// </summary>
-        /// <param name="directory">The directory.</param>
-        /// <param name="minDateModified">The min date modified.</param>
-        /// <param name="progress">The progress.</param>
-        /// <param name="cancellationToken">The task cancellation token.</param>
-        private void DeleteCacheFilesFromDirectory(string directory, DateTime minDateModified, IProgress<double> progress, CancellationToken cancellationToken)
+        progress.Report(90);
+
+        minDateModified = DateTime.UtcNow.AddDays(-1);
+
+        try
         {
-            var filesToDelete = _fileSystem.GetFiles(directory, true)
-                .Where(f => _fileSystem.GetLastWriteTimeUtc(f) < minDateModified)
-                .ToList();
+            DeleteCacheFilesFromDirectory(_applicationPaths.TempDirectory, minDateModified, progress, cancellationToken);
+        }
+        catch (DirectoryNotFoundException)
+        {
+            // No biggie here. Nothing to delete
+        }
 
-            var index = 0;
+        return Task.CompletedTask;
+    }
 
-            foreach (var file in filesToDelete)
-            {
-                double percent = index;
-                percent /= filesToDelete.Count;
+    /// <summary>
+    /// Deletes the cache files from directory with a last write time less than a given date.
+    /// </summary>
+    /// <param name="directory">The directory.</param>
+    /// <param name="minDateModified">The min date modified.</param>
+    /// <param name="progress">The progress.</param>
+    /// <param name="cancellationToken">The task cancellation token.</param>
+    private void DeleteCacheFilesFromDirectory(string directory, DateTime minDateModified, IProgress<double> progress, CancellationToken cancellationToken)
+    {
+        var filesToDelete = _fileSystem.GetFiles(directory, true)
+            .Where(f => _fileSystem.GetLastWriteTimeUtc(f) < minDateModified)
+            .ToList();
 
-                progress.Report(100 * percent);
+        var index = 0;
 
-                cancellationToken.ThrowIfCancellationRequested();
+        foreach (var file in filesToDelete)
+        {
+            double percent = index;
+            percent /= filesToDelete.Count;
 
-                FileSystemHelper.DeleteFile(_fileSystem, file.FullName, _logger);
+            progress.Report(100 * percent);
 
-                index++;
-            }
+            cancellationToken.ThrowIfCancellationRequested();
 
-            FileSystemHelper.DeleteEmptyFolders(_fileSystem, directory, _logger);
+            FileSystemHelper.DeleteFile(_fileSystem, file.FullName, _logger);
 
-            progress.Report(100);
+            index++;
         }
+
+        FileSystemHelper.DeleteEmptyFolders(_fileSystem, directory, _logger);
+
+        progress.Report(100);
     }
 }