Merge branch 'master' into master

1 files changed, 84 insertions, 80 deletions

diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
index b74f4d1b2..31153af20 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
@@ -10,111 +10,115 @@ using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Emby.Server.Implementations.ScheduledTasks.Tasks
+namespace Emby.Server.Implementations.ScheduledTasks.Tasks;
+
+/// <summary>
+/// Plugin Update Task.
+/// </summary>
+public class PluginUpdateTask : IScheduledTask, IConfigurableScheduledTask
 {
+    private readonly ILogger<PluginUpdateTask> _logger;
+
+    private readonly IInstallationManager _installationManager;
+    private readonly ILocalizationManager _localization;
+
     /// <summary>
-    /// Plugin Update Task.
+    /// Initializes a new instance of the <see cref="PluginUpdateTask" /> class.
     /// </summary>
-    public class PluginUpdateTask : IScheduledTask, IConfigurableScheduledTask
+    /// <param name="logger">Instance of the <see cref="ILogger"/> interface.</param>
+    /// <param name="installationManager">Instance of the <see cref="IInstallationManager"/> interface.</param>
+    /// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param>
+    public PluginUpdateTask(ILogger<PluginUpdateTask> logger, IInstallationManager installationManager, ILocalizationManager localization)
     {
-        private readonly ILogger<PluginUpdateTask> _logger;
-
-        private readonly IInstallationManager _installationManager;
-        private readonly ILocalizationManager _localization;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PluginUpdateTask" /> class.
-        /// </summary>
-        /// <param name="logger">Instance of the <see cref="ILogger"/> interface.</param>
-        /// <param name="installationManager">Instance of the <see cref="IInstallationManager"/> interface.</param>
-        /// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param>
-        public PluginUpdateTask(ILogger<PluginUpdateTask> logger, IInstallationManager installationManager, ILocalizationManager localization)
-        {
-            _logger = logger;
-            _installationManager = installationManager;
-            _localization = localization;
-        }
+        _logger = logger;
+        _installationManager = installationManager;
+        _localization = localization;
+    }
 
-        /// <inheritdoc />
-        public string Name => _localization.GetLocalizedString("TaskUpdatePlugins");
+    /// <inheritdoc />
+    public string Name => _localization.GetLocalizedString("TaskUpdatePlugins");
 
-        /// <inheritdoc />
-        public string Description => _localization.GetLocalizedString("TaskUpdatePluginsDescription");
+    /// <inheritdoc />
+    public string Description => _localization.GetLocalizedString("TaskUpdatePluginsDescription");
 
-        /// <inheritdoc />
-        public string Category => _localization.GetLocalizedString("TasksApplicationCategory");
+    /// <inheritdoc />
+    public string Category => _localization.GetLocalizedString("TasksApplicationCategory");
 
-        /// <inheritdoc />
-        public string Key => "PluginUpdates";
+    /// <inheritdoc />
+    public string Key => "PluginUpdates";
 
-        /// <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
         {
-            // At startup
-            yield return new TaskTriggerInfo { Type = TaskTriggerInfoType.StartupTrigger };
-
-            // Every so often
-            yield return new TaskTriggerInfo { Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(24).Ticks };
-        }
+            Type = TaskTriggerInfoType.StartupTrigger
+        };
 
-        /// <inheritdoc />
-        public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
+        yield return new TaskTriggerInfo
         {
-            progress.Report(0);
+            Type = TaskTriggerInfoType.IntervalTrigger,
+            IntervalTicks = TimeSpan.FromHours(24).Ticks
+        };
+    }
 
-            var packageFetchTask = _installationManager.GetAvailablePluginUpdates(cancellationToken);
-            var packagesToInstall = (await packageFetchTask.ConfigureAwait(false)).ToList();
+    /// <inheritdoc />
+    public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
+    {
+        progress.Report(0);
 
-            progress.Report(10);
+        var packageFetchTask = _installationManager.GetAvailablePluginUpdates(cancellationToken);
+        var packagesToInstall = (await packageFetchTask.ConfigureAwait(false)).ToList();
 
-            var numComplete = 0;
+        progress.Report(10);
 
-            foreach (var package in packagesToInstall)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
+        var numComplete = 0;
 
-                try
-                {
-                    await _installationManager.InstallPackage(package, cancellationToken).ConfigureAwait(false);
-                }
-                catch (OperationCanceledException)
-                {
-                    // InstallPackage has its own inner cancellation token, so only throw this if it's ours
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        throw;
-                    }
-                }
-                catch (HttpRequestException ex)
-                {
-                    _logger.LogError(ex, "Error downloading {0}", package.Name);
-                }
-                catch (IOException ex)
-                {
-                    _logger.LogError(ex, "Error updating {0}", package.Name);
-                }
-                catch (InvalidDataException ex)
-                {
-                    _logger.LogError(ex, "Error updating {0}", package.Name);
-                }
+        foreach (var package in packagesToInstall)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
 
-                // Update progress
-                lock (progress)
+            try
+            {
+                await _installationManager.InstallPackage(package, cancellationToken).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
+            {
+                // InstallPackage has its own inner cancellation token, so only throw this if it's ours
+                if (cancellationToken.IsCancellationRequested)
                 {
-                    progress.Report((90.0 * ++numComplete / packagesToInstall.Count) + 10);
+                    throw;
                 }
             }
+            catch (HttpRequestException ex)
+            {
+                _logger.LogError(ex, "Error downloading {Name}", package.Name);
+            }
+            catch (IOException ex)
+            {
+                _logger.LogError(ex, "Error updating {Name}", package.Name);
+            }
+            catch (InvalidDataException ex)
+            {
+                _logger.LogError(ex, "Error updating {Name}", package.Name);
+            }
 
-            progress.Report(100);
+            // Update progress
+            lock (progress)
+            {
+                progress.Report((90.0 * ++numComplete / packagesToInstall.Count) + 10);
+            }
         }
+
+        progress.Report(100);
     }
 }