Styling, format, minor code changes (crobibero)

3 files changed, 5 insertions, 9 deletions

diff --git a/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs b/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs
index f32557cd1..8ac7641aa 100644
--- a/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs
+++ b/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs
@@ -94,7 +94,7 @@ public class TrickplayImagesTask : IScheduledTask
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error creating trickplay files for {ItemName}: {Msg}", item.Name, ex);
+                _logger.LogError(ex, "Error creating trickplay files for {ItemName}", item.Name);
             }
 
             numComplete++;
diff --git a/MediaBrowser.Providers/Trickplay/TrickplayManager.cs b/MediaBrowser.Providers/Trickplay/TrickplayManager.cs
index 9b8eb8150..d377d2d80 100644
--- a/MediaBrowser.Providers/Trickplay/TrickplayManager.cs
+++ b/MediaBrowser.Providers/Trickplay/TrickplayManager.cs
@@ -33,6 +33,7 @@ public class TrickplayManager : ITrickplayManager
     private readonly IServerConfigurationManager _config;
 
     private static readonly SemaphoreSlim _resourcePool = new(1, 1);
+    private static readonly string[] _trickplayImgExtensions = { ".jpg" };
 
     /// <summary>
     /// Initializes a new instance of the <see cref="TrickplayManager"/> class.
@@ -95,10 +96,10 @@ public class TrickplayManager : ITrickplayManager
         var imgTempDir = string.Empty;
         var outputDir = GetTrickplayDirectory(video, width);
 
+        await _resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
+
         try
         {
-            await _resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
-
             if (!replace && Directory.Exists(outputDir) && GetTilesResolutions(video.Id).ContainsKey(width))
             {
                 _logger.LogDebug("Found existing trickplay files for {ItemId}. Exiting.", video.Id);
@@ -139,8 +140,7 @@ public class TrickplayManager : ITrickplayManager
                 throw new InvalidOperationException("Null or invalid directory from media encoder.");
             }
 
-            var images = _fileSystem.GetFiles(imgTempDir, new string[] { ".jpg" }, false, false)
-                .Where(img => string.Equals(img.Extension, ".jpg", StringComparison.Ordinal))
+            var images = _fileSystem.GetFiles(imgTempDir, _trickplayImgExtensions, false, false)
                 .OrderBy(i => i.FullName)
                 .ToList();
 
diff --git a/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs b/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs
index d467c480e..17e9efdde 100644
--- a/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs
+++ b/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs
@@ -25,7 +25,6 @@ public class TrickplayProvider : ICustomMetadataProvider<Episode>,
     IHasOrder,
     IForcedProvider
 {
-    private readonly ILogger<TrickplayProvider> _logger;
     private readonly IServerConfigurationManager _config;
     private readonly ITrickplayManager _trickplayManager;
     private readonly ILibraryManager _libraryManager;
@@ -33,17 +32,14 @@ public class TrickplayProvider : ICustomMetadataProvider<Episode>,
     /// <summary>
     /// Initializes a new instance of the <see cref="TrickplayProvider"/> class.
     /// </summary>
-    /// <param name="logger">The logger.</param>
     /// <param name="config">The configuration manager.</param>
     /// <param name="trickplayManager">The trickplay manager.</param>
     /// <param name="libraryManager">The library manager.</param>
     public TrickplayProvider(
-        ILogger<TrickplayProvider> logger,
         IServerConfigurationManager config,
         ITrickplayManager trickplayManager,
         ILibraryManager libraryManager)
     {
-        _logger = logger;
         _config = config;
         _trickplayManager = trickplayManager;
         _libraryManager = libraryManager;