Merge pull request #14028 from Shadowghost/cleanup-tasks

Cleanup Tasks and Validators

1 files changed, 54 insertions, 60 deletions

diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/OptimizeDatabaseTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/OptimizeDatabaseTask.cs
index 4d3a04377..bf8ffaf47 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/OptimizeDatabaseTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/OptimizeDatabaseTask.cs
@@ -5,84 +5,78 @@ using System.Threading.Tasks;
 using Jellyfin.Database.Implementations;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Tasks;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
-namespace Emby.Server.Implementations.ScheduledTasks.Tasks
+namespace Emby.Server.Implementations.ScheduledTasks.Tasks;
+
+/// <summary>
+/// Optimizes Jellyfin's database by issuing a VACUUM command.
+/// </summary>
+public class OptimizeDatabaseTask : IScheduledTask, IConfigurableScheduledTask
 {
+    private readonly ILogger<OptimizeDatabaseTask> _logger;
+    private readonly ILocalizationManager _localization;
+    private readonly IJellyfinDatabaseProvider _jellyfinDatabaseProvider;
+
     /// <summary>
-    /// Optimizes Jellyfin's database by issuing a VACUUM command.
+    /// Initializes a new instance of the <see cref="OptimizeDatabaseTask" /> class.
     /// </summary>
-    public class OptimizeDatabaseTask : IScheduledTask, IConfigurableScheduledTask
+    /// <param name="logger">Instance of the <see cref="ILogger"/> interface.</param>
+    /// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param>
+    /// <param name="jellyfinDatabaseProvider">Instance of the JellyfinDatabaseProvider that can be used for provider specific operations.</param>
+    public OptimizeDatabaseTask(
+        ILogger<OptimizeDatabaseTask> logger,
+        ILocalizationManager localization,
+        IJellyfinDatabaseProvider jellyfinDatabaseProvider)
     {
-        private readonly ILogger<OptimizeDatabaseTask> _logger;
-        private readonly ILocalizationManager _localization;
-        private readonly IDbContextFactory<JellyfinDbContext> _provider;
-        private readonly IJellyfinDatabaseProvider _jellyfinDatabaseProvider;
+        _logger = logger;
+        _localization = localization;
+        _jellyfinDatabaseProvider = jellyfinDatabaseProvider;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OptimizeDatabaseTask" /> class.
-        /// </summary>
-        /// <param name="logger">Instance of the <see cref="ILogger"/> interface.</param>
-        /// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param>
-        /// <param name="provider">Instance of the <see cref="IDbContextFactory{JellyfinDbContext}"/> interface.</param>
-        /// <param name="jellyfinDatabaseProvider">Instance of the JellyfinDatabaseProvider that can be used for provider specific operations.</param>
-        public OptimizeDatabaseTask(
-            ILogger<OptimizeDatabaseTask> logger,
-            ILocalizationManager localization,
-            IDbContextFactory<JellyfinDbContext> provider,
-            IJellyfinDatabaseProvider jellyfinDatabaseProvider)
-        {
-            _logger = logger;
-            _localization = localization;
-            _provider = provider;
-            _jellyfinDatabaseProvider = jellyfinDatabaseProvider;
-        }
+    /// <inheritdoc />
+    public string Name => _localization.GetLocalizedString("TaskOptimizeDatabase");
+
+    /// <inheritdoc />
+    public string Description => _localization.GetLocalizedString("TaskOptimizeDatabaseDescription");
 
-        /// <inheritdoc />
-        public string Name => _localization.GetLocalizedString("TaskOptimizeDatabase");
+    /// <inheritdoc />
+    public string Category => _localization.GetLocalizedString("TasksMaintenanceCategory");
 
-        /// <inheritdoc />
-        public string Description => _localization.GetLocalizedString("TaskOptimizeDatabaseDescription");
+    /// <inheritdoc />
+    public string Key => "OptimizeDatabaseTask";
 
-        /// <inheritdoc />
-        public string Category => _localization.GetLocalizedString("TasksMaintenanceCategory");
+    /// <inheritdoc />
+    public bool IsHidden => false;
 
-        /// <inheritdoc />
-        public string Key => "OptimizeDatabaseTask";
+    /// <inheritdoc />
+    public bool IsEnabled => true;
 
-        /// <inheritdoc />
-        public bool IsHidden => false;
+    /// <inheritdoc />
+    public bool IsLogged => true;
 
-        /// <inheritdoc />
-        public bool IsEnabled => true;
+    /// <inheritdoc />
+    public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+    {
+        yield return new TaskTriggerInfo
+        {
+            Type = TaskTriggerInfoType.IntervalTrigger,
+            IntervalTicks = TimeSpan.FromHours(24).Ticks
+        };
+    }
 
-        /// <inheritdoc />
-        public bool IsLogged => true;
+    /// <inheritdoc />
+    public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
+    {
+        _logger.LogInformation("Optimizing and vacuuming jellyfin.db...");
 
-        /// <inheritdoc />
-        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+        try
         {
-            return
-            [
-                // Every so often
-                new TaskTriggerInfo { Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(24).Ticks }
-            ];
+            await _jellyfinDatabaseProvider.RunScheduledOptimisation(cancellationToken).ConfigureAwait(false);
         }
-
-        /// <inheritdoc />
-        public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
+        catch (Exception e)
         {
-            _logger.LogInformation("Optimizing and vacuuming jellyfin.db...");
-
-            try
-            {
-                await _jellyfinDatabaseProvider.RunScheduledOptimisation(cancellationToken).ConfigureAwait(false);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Error while optimizing jellyfin.db");
-            }
+            _logger.LogError(e, "Error while optimizing jellyfin.db");
         }
     }
 }