From ca7d1a13000ad948eebbfdeb40542312f3e37d3e Mon Sep 17 00:00:00 2001
From: nicknsy <20588554+nicknsy@users.noreply.github.com>
Date: Wed, 22 Feb 2023 00:08:35 -0800
Subject: Trickplay generation, manager, storage

---
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 173 +++++++++++++++++++++
 1 file changed, 173 insertions(+)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 4e63d205c..7f8ec03fa 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -21,6 +21,7 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Extensions;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.MediaEncoding.Probing;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Dto;
@@ -28,8 +29,10 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
+using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using static Nikse.SubtitleEdit.Core.Common.IfoParser;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {
@@ -775,6 +778,176 @@ namespace MediaBrowser.MediaEncoding.Encoder
         }
 
         /// <inheritdoc />
+        public Task<string> ExtractVideoImagesOnIntervalAccelerated(
+            string inputFile,
+            string container,
+            MediaSourceInfo mediaSource,
+            MediaStream imageStream,
+            TimeSpan interval,
+            int maxWidth,
+            bool allowHwAccel,
+            bool allowHwEncode,
+            EncodingHelper encodingHelper,
+            CancellationToken cancellationToken)
+        {
+            var options = allowHwAccel ? _configurationManager.GetEncodingOptions() : new EncodingOptions();
+
+            // A new EncodingOptions instance must be used as to not disable HW acceleration for all of Jellyfin.
+            // Additionally, we must set a few fields without defaults to prevent null pointer exceptions.
+            if (!allowHwAccel)
+            {
+                options.EnableHardwareEncoding = false;
+                options.HardwareAccelerationType = string.Empty;
+                options.EnableTonemapping = false;
+            }
+
+            var baseRequest = new BaseEncodingJobOptions { MaxWidth = maxWidth };
+            var jobState = new EncodingJobInfo(TranscodingJobType.Progressive)
+            {
+                IsVideoRequest = true,  // must be true for InputVideoHwaccelArgs to return non-empty value
+                MediaSource = mediaSource,
+                VideoStream = imageStream,
+                BaseRequest = baseRequest,  // GetVideoProcessingFilterParam errors if null
+                MediaPath = inputFile,
+                OutputVideoCodec = "mjpeg"
+            };
+            var vidEncoder = options.AllowMjpegEncoding ? encodingHelper.GetVideoEncoder(jobState, options) : jobState.OutputVideoCodec;
+
+            // Get input and filter arguments
+            var inputArg = encodingHelper.GetInputArgument(jobState, options, container).Trim();
+            if (string.IsNullOrWhiteSpace(inputArg))
+            {
+                throw new InvalidOperationException("EncodingHelper returned empty input arguments.");
+            }
+
+            if (!allowHwAccel)
+            {
+                inputArg = "-threads " + _threads + " " + inputArg; // HW accel args set a different input thread count, only set if disabled
+            }
+
+            var filterParam = encodingHelper.GetVideoProcessingFilterParam(jobState, options, jobState.OutputVideoCodec).Trim();
+            if (string.IsNullOrWhiteSpace(filterParam) || filterParam.IndexOf("\"", StringComparison.Ordinal) == -1)
+            {
+                throw new InvalidOperationException("EncodingHelper returned empty or invalid filter parameters.");
+            }
+
+            return ExtractVideoImagesOnIntervalInternal(inputArg, filterParam, interval, vidEncoder, _threads, cancellationToken);
+        }
+
+        private async Task<string> ExtractVideoImagesOnIntervalInternal(
+            string inputArg,
+            string filterParam,
+            TimeSpan interval,
+            string vidEncoder,
+            int outputThreads,
+            CancellationToken cancellationToken)
+        {
+            if (string.IsNullOrWhiteSpace(inputArg))
+            {
+                throw new InvalidOperationException("Empty or invalid input argument.");
+            }
+
+            // Output arguments
+            string fps = "fps=1/" + interval.TotalSeconds.ToString(CultureInfo.InvariantCulture);
+            if (string.IsNullOrWhiteSpace(filterParam))
+            {
+                filterParam = "-vf \"" + fps + "\"";
+            }
+            else
+            {
+                filterParam = filterParam.Insert(filterParam.IndexOf("\"", StringComparison.Ordinal) + 1, fps + ",");
+            }
+
+            var targetDirectory = Path.Combine(_configurationManager.ApplicationPaths.TempDirectory, Guid.NewGuid().ToString("N"));
+            Directory.CreateDirectory(targetDirectory);
+            var outputPath = Path.Combine(targetDirectory, "%08d.jpg");
+
+            // Final command arguments
+            var args = string.Format(
+                CultureInfo.InvariantCulture,
+                "-loglevel error {0} -an -sn {1} -threads {2} -c:v {3} -f {4} \"{5}\"",
+                inputArg,
+                filterParam,
+                outputThreads,
+                vidEncoder,
+                "image2",
+                outputPath);
+
+            // Start ffmpeg process
+            var process = new Process
+            {
+                StartInfo = new ProcessStartInfo
+                {
+                    CreateNoWindow = true,
+                    UseShellExecute = false,
+                    FileName = _ffmpegPath,
+                    Arguments = args,
+                    WindowStyle = ProcessWindowStyle.Hidden,
+                    ErrorDialog = false,
+                },
+                EnableRaisingEvents = true
+            };
+
+            var processDescription = string.Format(CultureInfo.InvariantCulture, "{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
+            _logger.LogDebug("{ProcessDescription}", processDescription);
+
+            using (var processWrapper = new ProcessWrapper(process, this))
+            {
+                bool ranToCompletion = false;
+
+                await _thumbnailResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
+                try
+                {
+                    StartProcess(processWrapper);
+
+                    // Need to give ffmpeg enough time to make all the thumbnails, which could be a while,
+                    // but we still need to detect if the process hangs.
+                    // Making the assumption that as long as new jpegs are showing up, everything is good.
+
+                    bool isResponsive = true;
+                    int lastCount = 0;
+
+                    while (isResponsive)
+                    {
+                        if (await process.WaitForExitAsync(TimeSpan.FromSeconds(30)).ConfigureAwait(false))
+                        {
+                            ranToCompletion = true;
+                            break;
+                        }
+
+                        cancellationToken.ThrowIfCancellationRequested();
+
+                        var jpegCount = _fileSystem.GetFilePaths(targetDirectory)
+                            .Count(i => string.Equals(Path.GetExtension(i), ".jpg", StringComparison.OrdinalIgnoreCase));
+
+                        isResponsive = jpegCount > lastCount;
+                        lastCount = jpegCount;
+                    }
+
+                    if (!ranToCompletion)
+                    {
+                        _logger.LogInformation("Killing ffmpeg extraction process due to inactivity.");
+                        StopProcess(processWrapper, 1000);
+                    }
+                }
+                finally
+                {
+                    _thumbnailResourcePool.Release();
+                }
+
+                var exitCode = ranToCompletion ? processWrapper.ExitCode ?? 0 : -1;
+
+                if (exitCode == -1)
+                {
+                    _logger.LogError("ffmpeg image extraction failed for {ProcessDescription}", processDescription);
+
+                    throw new FfmpegException(string.Format(CultureInfo.InvariantCulture, "ffmpeg image extraction failed for {0}", processDescription));
+                }
+
+                return targetDirectory;
+            }
+        }
+
         public string GetTimeParameter(long ticks)
         {
             var time = TimeSpan.FromTicks(ticks);
-- 
cgit v1.2.3


From 6c649a7e723454e94303d95d178e91b820ba6b50 Mon Sep 17 00:00:00 2001
From: nicknsy <20588554+nicknsy@users.noreply.github.com>
Date: Thu, 23 Feb 2023 17:58:34 -0800
Subject: Options

---
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |  6 ++-
 .../Configuration/TrickplayOptions.cs              | 61 ++++++++++++++++++++++
 .../Configuration/TrickplayScanBehavior.cs         | 18 +++++++
 3 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 MediaBrowser.Model/Configuration/TrickplayOptions.cs
 create mode 100644 MediaBrowser.Model/Configuration/TrickplayScanBehavior.cs

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 7f8ec03fa..9b58f83b4 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -853,10 +853,14 @@ namespace MediaBrowser.MediaEncoding.Encoder
             {
                 filterParam = "-vf \"" + fps + "\"";
             }
-            else
+            else if (filterParam.IndexOf("\"", StringComparison.Ordinal) != -1)
             {
                 filterParam = filterParam.Insert(filterParam.IndexOf("\"", StringComparison.Ordinal) + 1, fps + ",");
             }
+            else
+            {
+                filterParam += fps + ",";
+            }
 
             var targetDirectory = Path.Combine(_configurationManager.ApplicationPaths.TempDirectory, Guid.NewGuid().ToString("N"));
             Directory.CreateDirectory(targetDirectory);
diff --git a/MediaBrowser.Model/Configuration/TrickplayOptions.cs b/MediaBrowser.Model/Configuration/TrickplayOptions.cs
new file mode 100644
index 000000000..d527baaa4
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/TrickplayOptions.cs
@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace MediaBrowser.Model.Configuration
+{
+    /// <summary>
+    /// Class TrickplayOptions.
+    /// </summary>
+    public class TrickplayOptions
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether or not to use HW acceleration.
+        /// </summary>
+        public bool EnableHwAcceleration { get; set; } = false;
+
+        /// <summary>
+        /// Gets or sets the behavior used by trickplay provider on library scan/update.
+        /// </summary>
+        public TrickplayScanBehavior ScanBehavior { get; set; } = TrickplayScanBehavior.NonBlocking;
+
+        /// <summary>
+        /// Gets or sets the process priority for the ffmpeg process.
+        /// </summary>
+        public ProcessPriorityClass ProcessPriority { get; set; } = ProcessPriorityClass.BelowNormal;
+
+        /// <summary>
+        /// Gets or sets the interval, in ms, between each new trickplay image.
+        /// </summary>
+        public int Interval { get; set; } = 10000;
+
+        /// <summary>
+        /// Gets or sets the target width resolutions, in px, to generates preview images for.
+        /// </summary>
+        public HashSet<int> WidthResolutions { get; set; } = new HashSet<int> { 320 };
+
+        /// <summary>
+        /// Gets or sets number of tile images to allow in X dimension.
+        /// </summary>
+        public int TileWidth { get; set; } = 10;
+
+        /// <summary>
+        /// Gets or sets number of tile images to allow in Y dimension.
+        /// </summary>
+        public int TileHeight { get; set; } = 10;
+
+        /// <summary>
+        /// Gets or sets the ffmpeg output quality level.
+        /// </summary>
+        public int Qscale { get; set; } = 10;
+
+        /// <summary>
+        /// Gets or sets the jpeg quality to use for image tiles.
+        /// </summary>
+        public int JpegQuality { get; set; } = 90;
+
+        /// <summary>
+        /// Gets or sets the number of threads to be used by ffmpeg.
+        /// </summary>
+        public int ProcessThreads { get; set; } = 0;
+    }
+}
diff --git a/MediaBrowser.Model/Configuration/TrickplayScanBehavior.cs b/MediaBrowser.Model/Configuration/TrickplayScanBehavior.cs
new file mode 100644
index 000000000..799794176
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/TrickplayScanBehavior.cs
@@ -0,0 +1,18 @@
+namespace MediaBrowser.Model.Configuration
+{
+    /// <summary>
+    /// Enum TrickplayScanBehavior.
+    /// </summary>
+    public enum TrickplayScanBehavior
+    {
+        /// <summary>
+        /// Starts generation, only return once complete.
+        /// </summary>
+        Blocking,
+
+        /// <summary>
+        /// Start generation, return immediately.
+        /// </summary>
+        NonBlocking
+    }
+}
-- 
cgit v1.2.3


From 6744e712d3a4fd6f800e5499c90b247787e48cb6 Mon Sep 17 00:00:00 2001
From: nicknsy <20588554+nicknsy@users.noreply.github.com>
Date: Sat, 25 Feb 2023 15:59:46 -0800
Subject: Use config values

---
 .../MediaEncoding/IMediaEncoder.cs                 | 13 ++++--
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 37 +++++++++++-----
 .../Configuration/ServerConfiguration.cs           |  2 +
 .../Trickplay/TrickplayImagesTask.cs               | 12 ++++--
 .../Trickplay/TrickplayManager.cs                  | 49 +++++++++++++++-------
 .../Trickplay/TrickplayProvider.cs                 | 16 ++++---
 6 files changed, 89 insertions(+), 40 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
index aa9faa936..f5e3d03cb 100644
--- a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Configuration;
@@ -145,10 +146,12 @@ namespace MediaBrowser.Controller.MediaEncoding
         /// <param name="container">Video container type.</param>
         /// <param name="mediaSource">Media source information.</param>
         /// <param name="imageStream">Media stream information.</param>
-        /// <param name="interval">The interval.</param>
         /// <param name="maxWidth">The maximum width.</param>
+        /// <param name="interval">The interval.</param>
         /// <param name="allowHwAccel">Allow for hardware acceleration.</param>
-        /// <param name="allowHwEncode">Allow for hardware encoding. allowHwAccel must also be true.</param>
+        /// <param name="threads">The input/output thread count for ffmpeg.</param>
+        /// <param name="qualityScale">The qscale value for ffmpeg.</param>
+        /// <param name="priority">The process priority for the ffmpeg process.</param>
         /// <param name="encodingHelper">EncodingHelper instance.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Directory where images where extracted. A given image made before another will always be named with a lower number.</returns>
@@ -157,10 +160,12 @@ namespace MediaBrowser.Controller.MediaEncoding
             string container,
             MediaSourceInfo mediaSource,
             MediaStream imageStream,
-            TimeSpan interval,
             int maxWidth,
+            TimeSpan interval,
             bool allowHwAccel,
-            bool allowHwEncode,
+            int? threads,
+            int? qualityScale,
+            ProcessPriorityClass? priority,
             EncodingHelper encodingHelper,
             CancellationToken cancellationToken);
 
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 9b58f83b4..11f42c3f9 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -783,14 +783,17 @@ namespace MediaBrowser.MediaEncoding.Encoder
             string container,
             MediaSourceInfo mediaSource,
             MediaStream imageStream,
-            TimeSpan interval,
             int maxWidth,
+            TimeSpan interval,
             bool allowHwAccel,
-            bool allowHwEncode,
+            int? threads,
+            int? qualityScale,
+            ProcessPriorityClass? priority,
             EncodingHelper encodingHelper,
             CancellationToken cancellationToken)
         {
             var options = allowHwAccel ? _configurationManager.GetEncodingOptions() : new EncodingOptions();
+            threads = threads ?? _threads;
 
             // A new EncodingOptions instance must be used as to not disable HW acceleration for all of Jellyfin.
             // Additionally, we must set a few fields without defaults to prevent null pointer exceptions.
@@ -822,7 +825,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             if (!allowHwAccel)
             {
-                inputArg = "-threads " + _threads + " " + inputArg; // HW accel args set a different input thread count, only set if disabled
+                inputArg = "-threads " + threads + " " + inputArg; // HW accel args set a different input thread count, only set if disabled
             }
 
             var filterParam = encodingHelper.GetVideoProcessingFilterParam(jobState, options, jobState.OutputVideoCodec).Trim();
@@ -831,7 +834,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 throw new InvalidOperationException("EncodingHelper returned empty or invalid filter parameters.");
             }
 
-            return ExtractVideoImagesOnIntervalInternal(inputArg, filterParam, interval, vidEncoder, _threads, cancellationToken);
+            return ExtractVideoImagesOnIntervalInternal(inputArg, filterParam, interval, vidEncoder, threads, qualityScale, priority, cancellationToken);
         }
 
         private async Task<string> ExtractVideoImagesOnIntervalInternal(
@@ -839,7 +842,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
             string filterParam,
             TimeSpan interval,
             string vidEncoder,
-            int outputThreads,
+            int? outputThreads,
+            int? qualityScale,
+            ProcessPriorityClass? priority,
             CancellationToken cancellationToken)
         {
             if (string.IsNullOrWhiteSpace(inputArg))
@@ -857,10 +862,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
             {
                 filterParam = filterParam.Insert(filterParam.IndexOf("\"", StringComparison.Ordinal) + 1, fps + ",");
             }
-            else
-            {
-                filterParam += fps + ",";
-            }
 
             var targetDirectory = Path.Combine(_configurationManager.ApplicationPaths.TempDirectory, Guid.NewGuid().ToString("N"));
             Directory.CreateDirectory(targetDirectory);
@@ -869,11 +870,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
             // Final command arguments
             var args = string.Format(
                 CultureInfo.InvariantCulture,
-                "-loglevel error {0} -an -sn {1} -threads {2} -c:v {3} -f {4} \"{5}\"",
+                "-loglevel error {0} -an -sn {1} -threads {2} -c:v {3} {4}-f {5} \"{6}\"",
                 inputArg,
                 filterParam,
-                outputThreads,
+                outputThreads.GetValueOrDefault(_threads),
                 vidEncoder,
+                qualityScale.HasValue ? "-qscale:v " + qualityScale.Value.ToString(CultureInfo.InvariantCulture) + " " : string.Empty,
                 "image2",
                 outputPath);
 
@@ -904,6 +906,19 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 {
                     StartProcess(processWrapper);
 
+                    // Set process priority
+                    if (priority.HasValue)
+                    {
+                        try
+                        {
+                            processWrapper.Process.PriorityClass = priority.Value;
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.LogDebug(ex, "Unable to set process priority to {Priority} for {Description}", priority.Value, processDescription);
+                        }
+                    }
+
                     // Need to give ffmpeg enough time to make all the thumbnails, which could be a while,
                     // but we still need to detect if the process hangs.
                     // Making the assumption that as long as new jpegs are showing up, everything is good.
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 78a310f0b..097eff295 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -264,5 +264,7 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value>The limit for parallel image encoding.</value>
         public int ParallelImageEncodingLimit { get; set; }
+
+        public TrickplayOptions TrickplayOptions { get; set; } = new TrickplayOptions();
     }
 }
diff --git a/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs b/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs
index 87ac145d7..a364926c0 100644
--- a/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs
+++ b/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs
@@ -22,7 +22,6 @@ namespace MediaBrowser.Providers.Trickplay
         private readonly ILogger<TrickplayImagesTask> _logger;
         private readonly ILibraryManager _libraryManager;
         private readonly ILocalizationManager _localization;
-        private readonly IServerConfigurationManager _configurationManager;
         private readonly ITrickplayManager _trickplayManager;
 
         /// <summary>
@@ -31,19 +30,16 @@ namespace MediaBrowser.Providers.Trickplay
         /// <param name="logger">The logger.</param>
         /// <param name="libraryManager">The library manager.</param>
         /// <param name="localization">The localization manager.</param>
-        /// <param name="configurationManager">The configuration manager.</param>
         /// <param name="trickplayManager">The trickplay manager.</param>
         public TrickplayImagesTask(
             ILogger<TrickplayImagesTask> logger,
             ILibraryManager libraryManager,
             ILocalizationManager localization,
-            IServerConfigurationManager configurationManager,
             ITrickplayManager trickplayManager)
         {
             _libraryManager = libraryManager;
             _logger = logger;
             _localization = localization;
-            _configurationManager = configurationManager;
             _trickplayManager = trickplayManager;
         }
 
@@ -77,6 +73,14 @@ namespace MediaBrowser.Providers.Trickplay
         public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
         {
             // TODO: libraryoptions dont run on libraries with trickplay disabled
+            /* will this still get all sub-items? should recursive be true?
+             * from chapterimagestask
+             *                 DtoOptions = new DtoOptions(false)
+                {
+                    EnableImages = false
+                },
+                SourceTypes = new SourceType[] { SourceType.Library },
+             */
             var items = _libraryManager.GetItemList(new InternalItemsQuery
             {
                 MediaTypes = new[] { MediaType.Video },
diff --git a/MediaBrowser.Providers/Trickplay/TrickplayManager.cs b/MediaBrowser.Providers/Trickplay/TrickplayManager.cs
index cb916dfdb..ed2c11281 100644
--- a/MediaBrowser.Providers/Trickplay/TrickplayManager.cs
+++ b/MediaBrowser.Providers/Trickplay/TrickplayManager.cs
@@ -5,11 +5,13 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Trickplay;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using Microsoft.Extensions.Logging;
@@ -28,6 +30,7 @@ namespace MediaBrowser.Providers.Trickplay
         private readonly IFileSystem _fileSystem;
         private readonly EncodingHelper _encodingHelper;
         private readonly ILibraryManager _libraryManager;
+        private readonly IServerConfigurationManager _config;
 
         private static readonly SemaphoreSlim _resourcePool = new(1, 1);
 
@@ -40,13 +43,15 @@ namespace MediaBrowser.Providers.Trickplay
         /// <param name="fileSystem">The file systen.</param>
         /// <param name="encodingHelper">The encoding helper.</param>
         /// <param name="libraryManager">The library manager.</param>
+        /// <param name="config">The server configuration manager.</param>
         public TrickplayManager(
             ILogger<TrickplayManager> logger,
             IItemRepository itemRepo,
             IMediaEncoder mediaEncoder,
             IFileSystem fileSystem,
             EncodingHelper encodingHelper,
-            ILibraryManager libraryManager)
+            ILibraryManager libraryManager,
+            IServerConfigurationManager config)
         {
             _logger = logger;
             _itemRepo = itemRepo;
@@ -54,6 +59,7 @@ namespace MediaBrowser.Providers.Trickplay
             _fileSystem = fileSystem;
             _encodingHelper = encodingHelper;
             _libraryManager = libraryManager;
+            _config = config;
         }
 
         /// <inheritdoc />
@@ -61,16 +67,27 @@ namespace MediaBrowser.Providers.Trickplay
         {
             _logger.LogDebug("Trickplay refresh for {ItemId} (replace existing: {Replace})", video.Id, replace);
 
-            foreach (var width in new int[] { 320 } /*todo conf*/)
+            var options = _config.Configuration.TrickplayOptions;
+            foreach (var width in options.WidthResolutions)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                await RefreshTrickplayData(video, replace, width, 10000/*todo conf*/, 10/*todo conf*/, 10/*todo conf*/, true/*todo conf*/, true/*todo conf*/, cancellationToken).ConfigureAwait(false);
+                await RefreshTrickplayDataInternal(
+                    video,
+                    replace,
+                    width,
+                    options,
+                    cancellationToken).ConfigureAwait(false);
             }
         }
 
-        private async Task RefreshTrickplayData(Video video, bool replace, int width, int interval, int tileWidth, int tileHeight, bool doHwAccel, bool doHwEncode, CancellationToken cancellationToken)
+        private async Task RefreshTrickplayDataInternal(
+            Video video,
+            bool replace,
+            int width,
+            TrickplayOptions options,
+            CancellationToken cancellationToken)
         {
-            if (!CanGenerateTrickplay(video, interval))
+            if (!CanGenerateTrickplay(video, options.Interval))
             {
                 return;
             }
@@ -108,10 +125,12 @@ namespace MediaBrowser.Providers.Trickplay
                     container,
                     mediaSource,
                     mediaStream,
-                    TimeSpan.FromMilliseconds(interval),
                     width,
-                    doHwAccel,
-                    doHwEncode,
+                    TimeSpan.FromMilliseconds(options.Interval),
+                    options.EnableHwAcceleration,
+                    options.ProcessThreads,
+                    options.Qscale,
+                    options.ProcessPriority,
                     _encodingHelper,
                     cancellationToken).ConfigureAwait(false);
 
@@ -127,7 +146,7 @@ namespace MediaBrowser.Providers.Trickplay
 
                 // Create tiles
                 var tilesTempDir = Path.Combine(imgTempDir, Guid.NewGuid().ToString("N"));
-                var tilesInfo = CreateTiles(images, width, interval, tileWidth, tileHeight, 100/* todo _config.JpegQuality*/, tilesTempDir, outputDir);
+                var tilesInfo = CreateTiles(images, width, options, tilesTempDir, outputDir);
 
                 // Save tiles info
                 try
@@ -166,7 +185,7 @@ namespace MediaBrowser.Providers.Trickplay
             }
         }
 
-        private TrickplayTilesInfo CreateTiles(List<FileSystemMetadata> images, int width, int interval, int tileWidth, int tileHeight, int quality, string workDir, string outputDir)
+        private TrickplayTilesInfo CreateTiles(List<FileSystemMetadata> images, int width, TrickplayOptions options, string workDir, string outputDir)
         {
             if (images.Count == 0)
             {
@@ -178,9 +197,9 @@ namespace MediaBrowser.Providers.Trickplay
             var tilesInfo = new TrickplayTilesInfo
             {
                 Width = width,
-                Interval = interval,
-                TileWidth = tileWidth,
-                TileHeight = tileHeight,
+                Interval = options.Interval,
+                TileWidth = options.TileWidth,
+                TileHeight = options.TileHeight,
                 TileCount = 0,
                 Bandwidth = 0
             };
@@ -244,7 +263,7 @@ namespace MediaBrowser.Providers.Trickplay
                 var tileGridPath = Path.Combine(workDir, $"{imgNo}.jpg");
                 using (var stream = File.OpenWrite(tileGridPath))
                 {
-                    tileGrid.Encode(stream, SKEncodedImageFormat.Jpeg, quality);
+                    tileGrid.Encode(stream, SKEncodedImageFormat.Jpeg, options.JpegQuality);
                 }
 
                 var bitrate = (int)Math.Ceiling((decimal)new FileInfo(tileGridPath).Length * 8 / tilesInfo.TileWidth / tilesInfo.TileHeight / (tilesInfo.Interval / 1000));
@@ -351,7 +370,7 @@ namespace MediaBrowser.Providers.Trickplay
             {
                 Directory.Move(source, destination);
             }
-            catch (System.IO.IOException)
+            catch (IOException)
             {
                 // Cross device move requires a copy
                 Directory.CreateDirectory(destination);
diff --git a/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs b/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs
index e4bd9e3c2..e29646725 100644
--- a/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs
+++ b/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs
@@ -7,6 +7,7 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Trickplay;
+using MediaBrowser.Model.Configuration;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Providers.Trickplay
@@ -25,7 +26,7 @@ namespace MediaBrowser.Providers.Trickplay
         IForcedProvider
     {
         private readonly ILogger<TrickplayProvider> _logger;
-        private readonly IServerConfigurationManager _configurationManager;
+        private readonly IServerConfigurationManager _config;
         private readonly ITrickplayManager _trickplayManager;
         private readonly ILibraryManager _libraryManager;
 
@@ -33,17 +34,17 @@ namespace MediaBrowser.Providers.Trickplay
         /// Initializes a new instance of the <see cref="TrickplayProvider"/> class.
         /// </summary>
         /// <param name="logger">The logger.</param>
-        /// <param name="configurationManager">The configuration manager.</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 configurationManager,
+            IServerConfigurationManager config,
             ITrickplayManager trickplayManager,
             ILibraryManager libraryManager)
         {
             _logger = logger;
-            _configurationManager = configurationManager;
+            _config = config;
             _trickplayManager = trickplayManager;
             _libraryManager = libraryManager;
         }
@@ -110,11 +111,14 @@ namespace MediaBrowser.Providers.Trickplay
                 return ItemUpdateType.None;
             }
 
-            // TODO: this is always blocking for metadata collection, make non-blocking option
-            if (true)
+            if (_config.Configuration.TrickplayOptions.ScanBehavior == TrickplayScanBehavior.Blocking)
             {
                 await _trickplayManager.RefreshTrickplayData(video, replace, cancellationToken).ConfigureAwait(false);
             }
+            else
+            {
+                _ = _trickplayManager.RefreshTrickplayData(video, replace, cancellationToken).ConfigureAwait(false);
+            }
 
             // The core doesn't need to trigger any save operations over this
             return ItemUpdateType.None;
-- 
cgit v1.2.3


From dd8ef08592830236b31307e2424b491e974f024a Mon Sep 17 00:00:00 2001
From: Nick <20588554+nicknsy@users.noreply.github.com>
Date: Wed, 29 Mar 2023 16:43:17 -0700
Subject: Move fps filter to GetVideoProcessingFilterParam

---
 .../MediaEncoding/EncodingHelper.cs                   |  9 +++++++++
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs    | 19 ++++---------------
 2 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 0889a90f4..bcdf2934a 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -4806,6 +4806,15 @@ namespace MediaBrowser.Controller.MediaEncoding
             subFilters?.RemoveAll(filter => string.IsNullOrEmpty(filter));
             overlayFilters?.RemoveAll(filter => string.IsNullOrEmpty(filter));
 
+            var framerate = GetFramerateParam(state);
+            if (framerate.HasValue)
+            {
+                mainFilters.Insert(0, string.Format(
+                    CultureInfo.InvariantCulture,
+                    "fps={0}",
+                    framerate.Value));
+            }
+
             var mainStr = string.Empty;
             if (mainFilters?.Count > 0)
             {
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 11f42c3f9..4692bf504 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -804,7 +804,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 options.EnableTonemapping = false;
             }
 
-            var baseRequest = new BaseEncodingJobOptions { MaxWidth = maxWidth };
+            var baseRequest = new BaseEncodingJobOptions { MaxWidth = maxWidth, MaxFramerate = (float)(1.0 / interval.TotalSeconds) };
             var jobState = new EncodingJobInfo(TranscodingJobType.Progressive)
             {
                 IsVideoRequest = true,  // must be true for InputVideoHwaccelArgs to return non-empty value
@@ -829,18 +829,17 @@ namespace MediaBrowser.MediaEncoding.Encoder
             }
 
             var filterParam = encodingHelper.GetVideoProcessingFilterParam(jobState, options, jobState.OutputVideoCodec).Trim();
-            if (string.IsNullOrWhiteSpace(filterParam) || filterParam.IndexOf("\"", StringComparison.Ordinal) == -1)
+            if (string.IsNullOrWhiteSpace(filterParam))
             {
                 throw new InvalidOperationException("EncodingHelper returned empty or invalid filter parameters.");
             }
 
-            return ExtractVideoImagesOnIntervalInternal(inputArg, filterParam, interval, vidEncoder, threads, qualityScale, priority, cancellationToken);
+            return ExtractVideoImagesOnIntervalInternal(inputArg, filterParam, vidEncoder, threads, qualityScale, priority, cancellationToken);
         }
 
         private async Task<string> ExtractVideoImagesOnIntervalInternal(
             string inputArg,
             string filterParam,
-            TimeSpan interval,
             string vidEncoder,
             int? outputThreads,
             int? qualityScale,
@@ -853,16 +852,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
             }
 
             // Output arguments
-            string fps = "fps=1/" + interval.TotalSeconds.ToString(CultureInfo.InvariantCulture);
-            if (string.IsNullOrWhiteSpace(filterParam))
-            {
-                filterParam = "-vf \"" + fps + "\"";
-            }
-            else if (filterParam.IndexOf("\"", StringComparison.Ordinal) != -1)
-            {
-                filterParam = filterParam.Insert(filterParam.IndexOf("\"", StringComparison.Ordinal) + 1, fps + ",");
-            }
-
             var targetDirectory = Path.Combine(_configurationManager.ApplicationPaths.TempDirectory, Guid.NewGuid().ToString("N"));
             Directory.CreateDirectory(targetDirectory);
             var outputPath = Path.Combine(targetDirectory, "%08d.jpg");
@@ -895,7 +884,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             };
 
             var processDescription = string.Format(CultureInfo.InvariantCulture, "{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
-            _logger.LogDebug("{ProcessDescription}", processDescription);
+            _logger.LogInformation("Trickplay generation: {ProcessDescription}", processDescription);
 
             using (var processWrapper = new ProcessWrapper(process, this))
             {
-- 
cgit v1.2.3


From 33770322282326304b4b8073f583d6fed2354c0b Mon Sep 17 00:00:00 2001
From: Nick <20588554+nicknsy@users.noreply.github.com>
Date: Mon, 1 May 2023 12:51:05 -0700
Subject: crobibero styling, format, code suggestions

---
 .../MediaEncoding/EncodingHelper.cs                |  27 +-
 .../Trickplay/ITrickplayManager.cs                 |  77 ++-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |   2 +-
 .../Configuration/TrickplayOptions.cs              | 109 ++--
 .../Configuration/TrickplayScanBehavior.cs         |  25 +-
 MediaBrowser.Model/Entities/TrickplayTilesInfo.cs  |  79 ++-
 .../Trickplay/TrickplayImagesTask.cs               | 147 +++---
 .../Trickplay/TrickplayManager.cs                  | 569 ++++++++++-----------
 .../Trickplay/TrickplayProvider.cs                 | 181 ++++---
 9 files changed, 602 insertions(+), 614 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index bcdf2934a..01b6e31e9 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -90,6 +90,13 @@ namespace MediaBrowser.Controller.MediaEncoding
             { "truehd", 6 },
         };
 
+        private static readonly string _defaultMjpegEncoder = "mjpeg";
+        private static readonly Dictionary<string, string> _mjpegCodecMap = new(StringComparer.OrdinalIgnoreCase)
+        {
+            { "vaapi", _defaultMjpegEncoder + "_vaapi" },
+            { "qsv", _defaultMjpegEncoder + "_qsv" }
+        };
+
         public static readonly string[] LosslessAudioCodecs = new string[]
         {
             "alac",
@@ -151,32 +158,20 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         private string GetMjpegEncoder(EncodingJobInfo state, EncodingOptions encodingOptions)
         {
-            var defaultEncoder = "mjpeg";
-
             if (state.VideoType == VideoType.VideoFile)
             {
                 var hwType = encodingOptions.HardwareAccelerationType;
 
-                var codecMap = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
-                {
-                    { "vaapi",                  defaultEncoder + "_vaapi" },
-                    { "qsv",                defaultEncoder + "_qsv" }
-                };
-
                 if (!string.IsNullOrEmpty(hwType)
                     && encodingOptions.EnableHardwareEncoding
-                    && codecMap.ContainsKey(hwType))
+                    && _mjpegCodecMap.TryGetValue(hwType, out var preferredEncoder)
+                    && _mediaEncoder.SupportsEncoder(preferredEncoder))
                 {
-                    var preferredEncoder = codecMap[hwType];
-
-                    if (_mediaEncoder.SupportsEncoder(preferredEncoder))
-                    {
-                        return preferredEncoder;
-                    }
+                    return preferredEncoder;
                 }
             }
 
-            return defaultEncoder;
+            return _defaultMjpegEncoder;
         }
 
         private bool IsVaapiSupported(EncodingJobInfo state)
diff --git a/MediaBrowser.Controller/Trickplay/ITrickplayManager.cs b/MediaBrowser.Controller/Trickplay/ITrickplayManager.cs
index bae458f98..8e82c57d4 100644
--- a/MediaBrowser.Controller/Trickplay/ITrickplayManager.cs
+++ b/MediaBrowser.Controller/Trickplay/ITrickplayManager.cs
@@ -5,50 +5,49 @@ using System.Threading.Tasks;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Entities;
 
-namespace MediaBrowser.Controller.Trickplay
+namespace MediaBrowser.Controller.Trickplay;
+
+/// <summary>
+/// Interface ITrickplayManager.
+/// </summary>
+public interface ITrickplayManager
 {
     /// <summary>
-    /// Interface ITrickplayManager.
+    /// Generate or replace trickplay data.
     /// </summary>
-    public interface ITrickplayManager
-    {
-        /// <summary>
-        /// Generate or replace trickplay data.
-        /// </summary>
-        /// <param name="video">The video.</param>
-        /// <param name="replace">Whether or not existing data should be replaced.</param>
-        /// <param name="cancellationToken">CancellationToken to use for operation.</param>
-        /// <returns>Task.</returns>
-        Task RefreshTrickplayData(Video video, bool replace, CancellationToken cancellationToken);
+    /// <param name="video">The video.</param>
+    /// <param name="replace">Whether or not existing data should be replaced.</param>
+    /// <param name="cancellationToken">CancellationToken to use for operation.</param>
+    /// <returns>Task.</returns>
+    Task RefreshTrickplayDataAsync(Video video, bool replace, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Get available trickplay resolutions and corresponding info.
-        /// </summary>
-        /// <param name="itemId">The item.</param>
-        /// <returns>Map of width resolutions to trickplay tiles info.</returns>
-        Dictionary<int, TrickplayTilesInfo> GetTilesResolutions(Guid itemId);
+    /// <summary>
+    /// Get available trickplay resolutions and corresponding info.
+    /// </summary>
+    /// <param name="itemId">The item.</param>
+    /// <returns>Map of width resolutions to trickplay tiles info.</returns>
+    Dictionary<int, TrickplayTilesInfo> GetTilesResolutions(Guid itemId);
 
-        /// <summary>
-        /// Saves trickplay tiles info.
-        /// </summary>
-        /// <param name="itemId">The item.</param>
-        /// <param name="tilesInfo">The trickplay tiles info.</param>
-        void SaveTilesInfo(Guid itemId, TrickplayTilesInfo tilesInfo);
+    /// <summary>
+    /// Saves trickplay tiles info.
+    /// </summary>
+    /// <param name="itemId">The item.</param>
+    /// <param name="tilesInfo">The trickplay tiles info.</param>
+    void SaveTilesInfo(Guid itemId, TrickplayTilesInfo tilesInfo);
 
-        /// <summary>
-        /// Gets the trickplay manifest.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns>A map of media source id to a map of tile width to tile info.</returns>
-        Dictionary<Guid, Dictionary<int, TrickplayTilesInfo>> GetTrickplayManifest(BaseItem item);
+    /// <summary>
+    /// Gets the trickplay manifest.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <returns>A map of media source id to a map of tile width to tile info.</returns>
+    Dictionary<Guid, Dictionary<int, TrickplayTilesInfo>> GetTrickplayManifest(BaseItem item);
 
-        /// <summary>
-        /// Gets the path to a trickplay tiles image.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="width">The width of a single tile.</param>
-        /// <param name="index">The tile grid's index.</param>
-        /// <returns>The absolute path.</returns>
-        string GetTrickplayTilePath(BaseItem item, int width, int index);
-    }
+    /// <summary>
+    /// Gets the path to a trickplay tiles image.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="width">The width of a single tile.</param>
+    /// <param name="index">The tile grid's index.</param>
+    /// <returns>The absolute path.</returns>
+    string GetTrickplayTilePath(BaseItem item, int width, int index);
 }
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 4692bf504..000831fe2 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -793,7 +793,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             CancellationToken cancellationToken)
         {
             var options = allowHwAccel ? _configurationManager.GetEncodingOptions() : new EncodingOptions();
-            threads = threads ?? _threads;
+            threads ??= _threads;
 
             // A new EncodingOptions instance must be used as to not disable HW acceleration for all of Jellyfin.
             // Additionally, we must set a few fields without defaults to prevent null pointer exceptions.
diff --git a/MediaBrowser.Model/Configuration/TrickplayOptions.cs b/MediaBrowser.Model/Configuration/TrickplayOptions.cs
index d89e5f590..1fff1a5ed 100644
--- a/MediaBrowser.Model/Configuration/TrickplayOptions.cs
+++ b/MediaBrowser.Model/Configuration/TrickplayOptions.cs
@@ -1,61 +1,60 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace MediaBrowser.Model.Configuration
+namespace MediaBrowser.Model.Configuration;
+
+/// <summary>
+/// Class TrickplayOptions.
+/// </summary>
+public class TrickplayOptions
 {
     /// <summary>
-    /// Class TrickplayOptions.
-    /// </summary>
-    public class TrickplayOptions
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether or not to use HW acceleration.
-        /// </summary>
-        public bool EnableHwAcceleration { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets the behavior used by trickplay provider on library scan/update.
-        /// </summary>
-        public TrickplayScanBehavior ScanBehavior { get; set; } = TrickplayScanBehavior.NonBlocking;
-
-        /// <summary>
-        /// Gets or sets the process priority for the ffmpeg process.
-        /// </summary>
-        public ProcessPriorityClass ProcessPriority { get; set; } = ProcessPriorityClass.BelowNormal;
-
-        /// <summary>
-        /// Gets or sets the interval, in ms, between each new trickplay image.
-        /// </summary>
-        public int Interval { get; set; } = 10000;
-
-        /// <summary>
-        /// Gets or sets the target width resolutions, in px, to generates preview images for.
-        /// </summary>
-        public int[] WidthResolutions { get; set; } = new[] { 320 };
-
-        /// <summary>
-        /// Gets or sets number of tile images to allow in X dimension.
-        /// </summary>
-        public int TileWidth { get; set; } = 10;
-
-        /// <summary>
-        /// Gets or sets number of tile images to allow in Y dimension.
-        /// </summary>
-        public int TileHeight { get; set; } = 10;
-
-        /// <summary>
-        /// Gets or sets the ffmpeg output quality level.
-        /// </summary>
-        public int Qscale { get; set; } = 4;
-
-        /// <summary>
-        /// Gets or sets the jpeg quality to use for image tiles.
-        /// </summary>
-        public int JpegQuality { get; set; } = 90;
-
-        /// <summary>
-        /// Gets or sets the number of threads to be used by ffmpeg.
-        /// </summary>
-        public int ProcessThreads { get; set; } = 0;
-    }
+    /// Gets or sets a value indicating whether or not to use HW acceleration.
+    /// </summary>
+    public bool EnableHwAcceleration { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets the behavior used by trickplay provider on library scan/update.
+    /// </summary>
+    public TrickplayScanBehavior ScanBehavior { get; set; } = TrickplayScanBehavior.NonBlocking;
+
+    /// <summary>
+    /// Gets or sets the process priority for the ffmpeg process.
+    /// </summary>
+    public ProcessPriorityClass ProcessPriority { get; set; } = ProcessPriorityClass.BelowNormal;
+
+    /// <summary>
+    /// Gets or sets the interval, in ms, between each new trickplay image.
+    /// </summary>
+    public int Interval { get; set; } = 10000;
+
+    /// <summary>
+    /// Gets or sets the target width resolutions, in px, to generates preview images for.
+    /// </summary>
+    public int[] WidthResolutions { get; set; } = new[] { 320 };
+
+    /// <summary>
+    /// Gets or sets number of tile images to allow in X dimension.
+    /// </summary>
+    public int TileWidth { get; set; } = 10;
+
+    /// <summary>
+    /// Gets or sets number of tile images to allow in Y dimension.
+    /// </summary>
+    public int TileHeight { get; set; } = 10;
+
+    /// <summary>
+    /// Gets or sets the ffmpeg output quality level.
+    /// </summary>
+    public int Qscale { get; set; } = 4;
+
+    /// <summary>
+    /// Gets or sets the jpeg quality to use for image tiles.
+    /// </summary>
+    public int JpegQuality { get; set; } = 90;
+
+    /// <summary>
+    /// Gets or sets the number of threads to be used by ffmpeg.
+    /// </summary>
+    public int ProcessThreads { get; set; } = 0;
 }
diff --git a/MediaBrowser.Model/Configuration/TrickplayScanBehavior.cs b/MediaBrowser.Model/Configuration/TrickplayScanBehavior.cs
index 799794176..d0db53218 100644
--- a/MediaBrowser.Model/Configuration/TrickplayScanBehavior.cs
+++ b/MediaBrowser.Model/Configuration/TrickplayScanBehavior.cs
@@ -1,18 +1,17 @@
-namespace MediaBrowser.Model.Configuration
+namespace MediaBrowser.Model.Configuration;
+
+/// <summary>
+/// Enum TrickplayScanBehavior.
+/// </summary>
+public enum TrickplayScanBehavior
 {
     /// <summary>
-    /// Enum TrickplayScanBehavior.
+    /// Starts generation, only return once complete.
     /// </summary>
-    public enum TrickplayScanBehavior
-    {
-        /// <summary>
-        /// Starts generation, only return once complete.
-        /// </summary>
-        Blocking,
+    Blocking,
 
-        /// <summary>
-        /// Start generation, return immediately.
-        /// </summary>
-        NonBlocking
-    }
+    /// <summary>
+    /// Start generation, return immediately.
+    /// </summary>
+    NonBlocking
 }
diff --git a/MediaBrowser.Model/Entities/TrickplayTilesInfo.cs b/MediaBrowser.Model/Entities/TrickplayTilesInfo.cs
index 84b6b0322..86d37787f 100644
--- a/MediaBrowser.Model/Entities/TrickplayTilesInfo.cs
+++ b/MediaBrowser.Model/Entities/TrickplayTilesInfo.cs
@@ -1,50 +1,49 @@
-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Model.Entities;
+
+/// <summary>
+/// Class TrickplayTilesInfo.
+/// </summary>
+public class TrickplayTilesInfo
 {
     /// <summary>
-    /// Class TrickplayTilesInfo.
+    /// Gets or sets width of an individual tile.
     /// </summary>
-    public class TrickplayTilesInfo
-    {
-        /// <summary>
-        /// Gets or sets width of an individual tile.
-        /// </summary>
-        /// <value>The width.</value>
-        public int Width { get; set; }
+    /// <value>The width.</value>
+    public int Width { get; set; }
 
-        /// <summary>
-        /// Gets or sets height of an individual tile.
-        /// </summary>
-        /// <value>The height.</value>
-        public int Height { get; set; }
+    /// <summary>
+    /// Gets or sets height of an individual tile.
+    /// </summary>
+    /// <value>The height.</value>
+    public int Height { get; set; }
 
-        /// <summary>
-        /// Gets or sets amount of tiles per row.
-        /// </summary>
-        /// <value>The tile grid's width.</value>
-        public int TileWidth { get; set; }
+    /// <summary>
+    /// Gets or sets amount of tiles per row.
+    /// </summary>
+    /// <value>The tile grid's width.</value>
+    public int TileWidth { get; set; }
 
-        /// <summary>
-        /// Gets or sets amount of tiles per column.
-        /// </summary>
-        /// <value>The tile grid's height.</value>
-        public int TileHeight { get; set; }
+    /// <summary>
+    /// Gets or sets amount of tiles per column.
+    /// </summary>
+    /// <value>The tile grid's height.</value>
+    public int TileHeight { get; set; }
 
-        /// <summary>
-        /// Gets or sets total amount of non-black tiles.
-        /// </summary>
-        /// <value>The tile count.</value>
-        public int TileCount { get; set; }
+    /// <summary>
+    /// Gets or sets total amount of non-black tiles.
+    /// </summary>
+    /// <value>The tile count.</value>
+    public int TileCount { get; set; }
 
-        /// <summary>
-        /// Gets or sets interval in milliseconds between each trickplay tile.
-        /// </summary>
-        /// <value>The interval.</value>
-        public int Interval { get; set; }
+    /// <summary>
+    /// Gets or sets interval in milliseconds between each trickplay tile.
+    /// </summary>
+    /// <value>The interval.</value>
+    public int Interval { get; set; }
 
-        /// <summary>
-        /// Gets or sets peak bandwith usage in bits per second.
-        /// </summary>
-        /// <value>The bandwidth.</value>
-        public int Bandwidth { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets peak bandwith usage in bits per second.
+    /// </summary>
+    /// <value>The bandwidth.</value>
+    public int Bandwidth { get; set; }
 }
diff --git a/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs b/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs
index 8d0d9d5a3..f32557cd1 100644
--- a/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs
+++ b/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs
@@ -12,98 +12,97 @@ using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace MediaBrowser.Providers.Trickplay
+namespace MediaBrowser.Providers.Trickplay;
+
+/// <summary>
+/// Class TrickplayImagesTask.
+/// </summary>
+public class TrickplayImagesTask : IScheduledTask
 {
+    private readonly ILogger<TrickplayImagesTask> _logger;
+    private readonly ILibraryManager _libraryManager;
+    private readonly ILocalizationManager _localization;
+    private readonly ITrickplayManager _trickplayManager;
+
     /// <summary>
-    /// Class TrickplayImagesTask.
+    /// Initializes a new instance of the <see cref="TrickplayImagesTask"/> class.
     /// </summary>
-    public class TrickplayImagesTask : IScheduledTask
+    /// <param name="logger">The logger.</param>
+    /// <param name="libraryManager">The library manager.</param>
+    /// <param name="localization">The localization manager.</param>
+    /// <param name="trickplayManager">The trickplay manager.</param>
+    public TrickplayImagesTask(
+        ILogger<TrickplayImagesTask> logger,
+        ILibraryManager libraryManager,
+        ILocalizationManager localization,
+        ITrickplayManager trickplayManager)
     {
-        private readonly ILogger<TrickplayImagesTask> _logger;
-        private readonly ILibraryManager _libraryManager;
-        private readonly ILocalizationManager _localization;
-        private readonly ITrickplayManager _trickplayManager;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TrickplayImagesTask"/> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="libraryManager">The library manager.</param>
-        /// <param name="localization">The localization manager.</param>
-        /// <param name="trickplayManager">The trickplay manager.</param>
-        public TrickplayImagesTask(
-            ILogger<TrickplayImagesTask> logger,
-            ILibraryManager libraryManager,
-            ILocalizationManager localization,
-            ITrickplayManager trickplayManager)
-        {
-            _libraryManager = libraryManager;
-            _logger = logger;
-            _localization = localization;
-            _trickplayManager = trickplayManager;
-        }
+        _libraryManager = libraryManager;
+        _logger = logger;
+        _localization = localization;
+        _trickplayManager = trickplayManager;
+    }
 
-        /// <inheritdoc />
-        public string Name => _localization.GetLocalizedString("TaskRefreshTrickplayImages");
+    /// <inheritdoc />
+    public string Name => _localization.GetLocalizedString("TaskRefreshTrickplayImages");
 
-        /// <inheritdoc />
-        public string Description => _localization.GetLocalizedString("TaskRefreshTrickplayImagesDescription");
+    /// <inheritdoc />
+    public string Description => _localization.GetLocalizedString("TaskRefreshTrickplayImagesDescription");
 
-        /// <inheritdoc />
-        public string Key => "RefreshTrickplayImages";
+    /// <inheritdoc />
+    public string Key => "RefreshTrickplayImages";
 
-        /// <inheritdoc />
-        public string Category => _localization.GetLocalizedString("TasksLibraryCategory");
+    /// <inheritdoc />
+    public string Category => _localization.GetLocalizedString("TasksLibraryCategory");
 
-        /// <inheritdoc />
-        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+    /// <inheritdoc />
+    public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+    {
+        return new[]
         {
-            return new[]
+            new TaskTriggerInfo
             {
-                new TaskTriggerInfo
-                {
-                    Type = TaskTriggerInfo.TriggerDaily,
-                    TimeOfDayTicks = TimeSpan.FromHours(3).Ticks
-                }
-            };
-        }
+                Type = TaskTriggerInfo.TriggerDaily,
+                TimeOfDayTicks = TimeSpan.FromHours(3).Ticks
+            }
+        };
+    }
 
-        /// <inheritdoc />
-        public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
+    {
+        var items = _libraryManager.GetItemList(new InternalItemsQuery
         {
-            var items = _libraryManager.GetItemList(new InternalItemsQuery
-            {
-                MediaTypes = new[] { MediaType.Video },
-                IsVirtualItem = false,
-                IsFolder = false,
-                Recursive = true
-            }).OfType<Video>().ToList();
+            MediaTypes = new[] { MediaType.Video },
+            IsVirtualItem = false,
+            IsFolder = false,
+            Recursive = true
+        }).OfType<Video>().ToList();
 
-            var numComplete = 0;
+        var numComplete = 0;
 
-            foreach (var item in items)
+        foreach (var item in items)
+        {
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                await _trickplayManager.RefreshTrickplayDataAsync(item, false, cancellationToken).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
             {
-                try
-                {
-                    cancellationToken.ThrowIfCancellationRequested();
-                    await _trickplayManager.RefreshTrickplayData(item, false, cancellationToken).ConfigureAwait(false);
-                }
-                catch (OperationCanceledException)
-                {
-                    break;
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError("Error creating trickplay files for {ItemName}: {Msg}", item.Name, ex);
-                }
+                break;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("Error creating trickplay files for {ItemName}: {Msg}", item.Name, ex);
+            }
 
-                numComplete++;
-                double percent = numComplete;
-                percent /= items.Count;
-                percent *= 100;
+            numComplete++;
+            double percent = numComplete;
+            percent /= items.Count;
+            percent *= 100;
 
-                progress.Report(percent);
-            }
+            progress.Report(percent);
         }
     }
 }
diff --git a/MediaBrowser.Providers/Trickplay/TrickplayManager.cs b/MediaBrowser.Providers/Trickplay/TrickplayManager.cs
index ed2c11281..9b8eb8150 100644
--- a/MediaBrowser.Providers/Trickplay/TrickplayManager.cs
+++ b/MediaBrowser.Providers/Trickplay/TrickplayManager.cs
@@ -17,370 +17,369 @@ using MediaBrowser.Model.IO;
 using Microsoft.Extensions.Logging;
 using SkiaSharp;
 
-namespace MediaBrowser.Providers.Trickplay
+namespace MediaBrowser.Providers.Trickplay;
+
+/// <summary>
+/// ITrickplayManager implementation.
+/// </summary>
+public class TrickplayManager : ITrickplayManager
 {
+    private readonly ILogger<TrickplayManager> _logger;
+    private readonly IItemRepository _itemRepo;
+    private readonly IMediaEncoder _mediaEncoder;
+    private readonly IFileSystem _fileSystem;
+    private readonly EncodingHelper _encodingHelper;
+    private readonly ILibraryManager _libraryManager;
+    private readonly IServerConfigurationManager _config;
+
+    private static readonly SemaphoreSlim _resourcePool = new(1, 1);
+
     /// <summary>
-    /// ITrickplayManager implementation.
+    /// Initializes a new instance of the <see cref="TrickplayManager"/> class.
     /// </summary>
-    public class TrickplayManager : ITrickplayManager
+    /// <param name="logger">The logger.</param>
+    /// <param name="itemRepo">The item repository.</param>
+    /// <param name="mediaEncoder">The media encoder.</param>
+    /// <param name="fileSystem">The file systen.</param>
+    /// <param name="encodingHelper">The encoding helper.</param>
+    /// <param name="libraryManager">The library manager.</param>
+    /// <param name="config">The server configuration manager.</param>
+    public TrickplayManager(
+        ILogger<TrickplayManager> logger,
+        IItemRepository itemRepo,
+        IMediaEncoder mediaEncoder,
+        IFileSystem fileSystem,
+        EncodingHelper encodingHelper,
+        ILibraryManager libraryManager,
+        IServerConfigurationManager config)
     {
-        private readonly ILogger<TrickplayManager> _logger;
-        private readonly IItemRepository _itemRepo;
-        private readonly IMediaEncoder _mediaEncoder;
-        private readonly IFileSystem _fileSystem;
-        private readonly EncodingHelper _encodingHelper;
-        private readonly ILibraryManager _libraryManager;
-        private readonly IServerConfigurationManager _config;
-
-        private static readonly SemaphoreSlim _resourcePool = new(1, 1);
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TrickplayManager"/> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="itemRepo">The item repository.</param>
-        /// <param name="mediaEncoder">The media encoder.</param>
-        /// <param name="fileSystem">The file systen.</param>
-        /// <param name="encodingHelper">The encoding helper.</param>
-        /// <param name="libraryManager">The library manager.</param>
-        /// <param name="config">The server configuration manager.</param>
-        public TrickplayManager(
-            ILogger<TrickplayManager> logger,
-            IItemRepository itemRepo,
-            IMediaEncoder mediaEncoder,
-            IFileSystem fileSystem,
-            EncodingHelper encodingHelper,
-            ILibraryManager libraryManager,
-            IServerConfigurationManager config)
+        _logger = logger;
+        _itemRepo = itemRepo;
+        _mediaEncoder = mediaEncoder;
+        _fileSystem = fileSystem;
+        _encodingHelper = encodingHelper;
+        _libraryManager = libraryManager;
+        _config = config;
+    }
+
+    /// <inheritdoc />
+    public async Task RefreshTrickplayDataAsync(Video video, bool replace, CancellationToken cancellationToken)
+    {
+        _logger.LogDebug("Trickplay refresh for {ItemId} (replace existing: {Replace})", video.Id, replace);
+
+        var options = _config.Configuration.TrickplayOptions;
+        foreach (var width in options.WidthResolutions)
         {
-            _logger = logger;
-            _itemRepo = itemRepo;
-            _mediaEncoder = mediaEncoder;
-            _fileSystem = fileSystem;
-            _encodingHelper = encodingHelper;
-            _libraryManager = libraryManager;
-            _config = config;
+            cancellationToken.ThrowIfCancellationRequested();
+            await RefreshTrickplayDataInternal(
+                video,
+                replace,
+                width,
+                options,
+                cancellationToken).ConfigureAwait(false);
         }
+    }
 
-        /// <inheritdoc />
-        public async Task RefreshTrickplayData(Video video, bool replace, CancellationToken cancellationToken)
+    private async Task RefreshTrickplayDataInternal(
+        Video video,
+        bool replace,
+        int width,
+        TrickplayOptions options,
+        CancellationToken cancellationToken)
+    {
+        if (!CanGenerateTrickplay(video, options.Interval))
         {
-            _logger.LogDebug("Trickplay refresh for {ItemId} (replace existing: {Replace})", video.Id, replace);
-
-            var options = _config.Configuration.TrickplayOptions;
-            foreach (var width in options.WidthResolutions)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await RefreshTrickplayDataInternal(
-                    video,
-                    replace,
-                    width,
-                    options,
-                    cancellationToken).ConfigureAwait(false);
-            }
+            return;
         }
 
-        private async Task RefreshTrickplayDataInternal(
-            Video video,
-            bool replace,
-            int width,
-            TrickplayOptions options,
-            CancellationToken cancellationToken)
+        var imgTempDir = string.Empty;
+        var outputDir = GetTrickplayDirectory(video, width);
+
+        try
         {
-            if (!CanGenerateTrickplay(video, options.Interval))
+            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);
                 return;
             }
 
-            var imgTempDir = string.Empty;
-            var outputDir = GetTrickplayDirectory(video, width);
+            // Extract images
+            // Note: Media sources under parent items exist as their own video/item as well. Only use this video stream for trickplay.
+            var mediaSource = video.GetMediaSources(false).Find(source => Guid.Parse(source.Id).Equals(video.Id));
 
-            try
+            if (mediaSource is null)
             {
-                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);
-                    return;
-                }
-
-                // Extract images
-                // Note: Media sources under parent items exist as their own video/item as well. Only use this video stream for trickplay.
-                var mediaSource = video.GetMediaSources(false).Find(source => Guid.Parse(source.Id).Equals(video.Id));
-
-                if (mediaSource is null)
-                {
-                    _logger.LogDebug("Found no matching media source for item {ItemId}", video.Id);
-                    return;
-                }
+                _logger.LogDebug("Found no matching media source for item {ItemId}", video.Id);
+                return;
+            }
 
-                var mediaPath = mediaSource.Path;
-                var mediaStream = mediaSource.VideoStream;
-                var container = mediaSource.Container;
-
-                _logger.LogInformation("Creating trickplay files at {Width} width, for {Path} [ID: {ItemId}]", width, mediaPath, video.Id);
-                imgTempDir = await _mediaEncoder.ExtractVideoImagesOnIntervalAccelerated(
-                    mediaPath,
-                    container,
-                    mediaSource,
-                    mediaStream,
-                    width,
-                    TimeSpan.FromMilliseconds(options.Interval),
-                    options.EnableHwAcceleration,
-                    options.ProcessThreads,
-                    options.Qscale,
-                    options.ProcessPriority,
-                    _encodingHelper,
-                    cancellationToken).ConfigureAwait(false);
-
-                if (string.IsNullOrEmpty(imgTempDir) || !Directory.Exists(imgTempDir))
-                {
-                    throw new InvalidOperationException("Null or invalid directory from media encoder.");
-                }
+            var mediaPath = mediaSource.Path;
+            var mediaStream = mediaSource.VideoStream;
+            var container = mediaSource.Container;
+
+            _logger.LogInformation("Creating trickplay files at {Width} width, for {Path} [ID: {ItemId}]", width, mediaPath, video.Id);
+            imgTempDir = await _mediaEncoder.ExtractVideoImagesOnIntervalAccelerated(
+                mediaPath,
+                container,
+                mediaSource,
+                mediaStream,
+                width,
+                TimeSpan.FromMilliseconds(options.Interval),
+                options.EnableHwAcceleration,
+                options.ProcessThreads,
+                options.Qscale,
+                options.ProcessPriority,
+                _encodingHelper,
+                cancellationToken).ConfigureAwait(false);
+
+            if (string.IsNullOrEmpty(imgTempDir) || !Directory.Exists(imgTempDir))
+            {
+                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))
-                    .OrderBy(i => i.FullName)
-                    .ToList();
+            var images = _fileSystem.GetFiles(imgTempDir, new string[] { ".jpg" }, false, false)
+                .Where(img => string.Equals(img.Extension, ".jpg", StringComparison.Ordinal))
+                .OrderBy(i => i.FullName)
+                .ToList();
 
-                // Create tiles
-                var tilesTempDir = Path.Combine(imgTempDir, Guid.NewGuid().ToString("N"));
-                var tilesInfo = CreateTiles(images, width, options, tilesTempDir, outputDir);
+            // Create tiles
+            var tilesTempDir = Path.Combine(imgTempDir, Guid.NewGuid().ToString("N"));
+            var tilesInfo = CreateTiles(images, width, options, tilesTempDir, outputDir);
 
-                // Save tiles info
-                try
+            // Save tiles info
+            try
+            {
+                if (tilesInfo is not null)
                 {
-                    if (tilesInfo is not null)
-                    {
-                        SaveTilesInfo(video.Id, tilesInfo);
-                        _logger.LogInformation("Finished creation of trickplay files for {0}", mediaPath);
-                    }
-                    else
-                    {
-                        throw new InvalidOperationException("Null trickplay tiles info from CreateTiles.");
-                    }
+                    SaveTilesInfo(video.Id, tilesInfo);
+                    _logger.LogInformation("Finished creation of trickplay files for {0}", mediaPath);
                 }
-                catch (Exception ex)
+                else
                 {
-                    _logger.LogError(ex, "Error while saving trickplay tiles info.");
-
-                    // Make sure no files stay in metadata folders on failure
-                    // if tiles info wasn't saved.
-                    Directory.Delete(outputDir, true);
+                    throw new InvalidOperationException("Null trickplay tiles info from CreateTiles.");
                 }
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Error creating trickplay images.");
-            }
-            finally
-            {
-                _resourcePool.Release();
+                _logger.LogError(ex, "Error while saving trickplay tiles info.");
 
-                if (!string.IsNullOrEmpty(imgTempDir))
-                {
-                    Directory.Delete(imgTempDir, true);
-                }
+                // Make sure no files stay in metadata folders on failure
+                // if tiles info wasn't saved.
+                Directory.Delete(outputDir, true);
             }
         }
-
-        private TrickplayTilesInfo CreateTiles(List<FileSystemMetadata> images, int width, TrickplayOptions options, string workDir, string outputDir)
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error creating trickplay images.");
+        }
+        finally
         {
-            if (images.Count == 0)
+            _resourcePool.Release();
+
+            if (!string.IsNullOrEmpty(imgTempDir))
             {
-                throw new InvalidOperationException("Can't create trickplay from 0 images.");
+                Directory.Delete(imgTempDir, true);
             }
+        }
+    }
 
-            Directory.CreateDirectory(workDir);
+    private TrickplayTilesInfo CreateTiles(List<FileSystemMetadata> images, int width, TrickplayOptions options, string workDir, string outputDir)
+    {
+        if (images.Count == 0)
+        {
+            throw new InvalidOperationException("Can't create trickplay from 0 images.");
+        }
 
-            var tilesInfo = new TrickplayTilesInfo
-            {
-                Width = width,
-                Interval = options.Interval,
-                TileWidth = options.TileWidth,
-                TileHeight = options.TileHeight,
-                TileCount = 0,
-                Bandwidth = 0
-            };
-
-            var firstImg = SKBitmap.Decode(images[0].FullName);
-            if (firstImg == null)
-            {
-                throw new InvalidDataException("Could not decode image data.");
-            }
+        Directory.CreateDirectory(workDir);
 
-            tilesInfo.Height = firstImg.Height;
-            if (tilesInfo.Width != firstImg.Width)
-            {
-                throw new InvalidOperationException("Image width does not match config width.");
-            }
+        var tilesInfo = new TrickplayTilesInfo
+        {
+            Width = width,
+            Interval = options.Interval,
+            TileWidth = options.TileWidth,
+            TileHeight = options.TileHeight,
+            TileCount = 0,
+            Bandwidth = 0
+        };
+
+        var firstImg = SKBitmap.Decode(images[0].FullName);
+        if (firstImg == null)
+        {
+            throw new InvalidDataException("Could not decode image data.");
+        }
 
-            /*
-             * Generate grids of trickplay image tiles
-             */
-            var imgNo = 0;
-            var i = 0;
-            while (i < images.Count)
-            {
-                var tileGrid = new SKBitmap(tilesInfo.Width * tilesInfo.TileWidth, tilesInfo.Height * tilesInfo.TileHeight);
+        tilesInfo.Height = firstImg.Height;
+        if (tilesInfo.Width != firstImg.Width)
+        {
+            throw new InvalidOperationException("Image width does not match config width.");
+        }
+
+        /*
+         * Generate grids of trickplay image tiles
+         */
+        var imgNo = 0;
+        var i = 0;
+        while (i < images.Count)
+        {
+            var tileGrid = new SKBitmap(tilesInfo.Width * tilesInfo.TileWidth, tilesInfo.Height * tilesInfo.TileHeight);
 
-                using (var canvas = new SKCanvas(tileGrid))
+            using (var canvas = new SKCanvas(tileGrid))
+            {
+                for (var y = 0; y < tilesInfo.TileHeight; y++)
                 {
-                    for (var y = 0; y < tilesInfo.TileHeight; y++)
+                    for (var x = 0; x < tilesInfo.TileWidth; x++)
                     {
-                        for (var x = 0; x < tilesInfo.TileWidth; x++)
+                        if (i >= images.Count)
                         {
-                            if (i >= images.Count)
-                            {
-                                break;
-                            }
-
-                            var img = SKBitmap.Decode(images[i].FullName);
-                            if (img == null)
-                            {
-                                throw new InvalidDataException("Could not decode image data.");
-                            }
-
-                            if (tilesInfo.Width != img.Width)
-                            {
-                                throw new InvalidOperationException("Image width does not match config width.");
-                            }
-
-                            if (tilesInfo.Height != img.Height)
-                            {
-                                throw new InvalidOperationException("Image height does not match first image height.");
-                            }
-
-                            canvas.DrawBitmap(img, x * tilesInfo.Width, y * tilesInfo.Height);
-                            tilesInfo.TileCount++;
-                            i++;
+                            break;
                         }
-                    }
-                }
 
-                // Output each tile grid to singular file
-                var tileGridPath = Path.Combine(workDir, $"{imgNo}.jpg");
-                using (var stream = File.OpenWrite(tileGridPath))
-                {
-                    tileGrid.Encode(stream, SKEncodedImageFormat.Jpeg, options.JpegQuality);
-                }
+                        var img = SKBitmap.Decode(images[i].FullName);
+                        if (img == null)
+                        {
+                            throw new InvalidDataException("Could not decode image data.");
+                        }
+
+                        if (tilesInfo.Width != img.Width)
+                        {
+                            throw new InvalidOperationException("Image width does not match config width.");
+                        }
 
-                var bitrate = (int)Math.Ceiling((decimal)new FileInfo(tileGridPath).Length * 8 / tilesInfo.TileWidth / tilesInfo.TileHeight / (tilesInfo.Interval / 1000));
-                tilesInfo.Bandwidth = Math.Max(tilesInfo.Bandwidth, bitrate);
+                        if (tilesInfo.Height != img.Height)
+                        {
+                            throw new InvalidOperationException("Image height does not match first image height.");
+                        }
 
-                imgNo++;
+                        canvas.DrawBitmap(img, x * tilesInfo.Width, y * tilesInfo.Height);
+                        tilesInfo.TileCount++;
+                        i++;
+                    }
+                }
             }
 
-            /*
-             * Move trickplay tiles to output directory
-             */
-            Directory.CreateDirectory(outputDir);
-
-            // Replace existing tile grids if they already exist
-            if (Directory.Exists(outputDir))
+            // Output each tile grid to singular file
+            var tileGridPath = Path.Combine(workDir, $"{imgNo}.jpg");
+            using (var stream = File.OpenWrite(tileGridPath))
             {
-                Directory.Delete(outputDir, true);
+                tileGrid.Encode(stream, SKEncodedImageFormat.Jpeg, options.JpegQuality);
             }
 
-            MoveDirectory(workDir, outputDir);
+            var bitrate = (int)Math.Ceiling((decimal)new FileInfo(tileGridPath).Length * 8 / tilesInfo.TileWidth / tilesInfo.TileHeight / (tilesInfo.Interval / 1000));
+            tilesInfo.Bandwidth = Math.Max(tilesInfo.Bandwidth, bitrate);
 
-            return tilesInfo;
+            imgNo++;
         }
 
-        private bool CanGenerateTrickplay(Video video, int interval)
-        {
-            var videoType = video.VideoType;
-            if (videoType == VideoType.Iso || videoType == VideoType.Dvd || videoType == VideoType.BluRay)
-            {
-                return false;
-            }
-
-            if (video.IsPlaceHolder)
-            {
-                return false;
-            }
+        /*
+         * Move trickplay tiles to output directory
+         */
+        Directory.CreateDirectory(outputDir);
 
-            if (video.IsShortcut)
-            {
-                return false;
-            }
+        // Replace existing tile grids if they already exist
+        if (Directory.Exists(outputDir))
+        {
+            Directory.Delete(outputDir, true);
+        }
 
-            if (!video.IsCompleteMedia)
-            {
-                return false;
-            }
+        MoveDirectory(workDir, outputDir);
 
-            if (!video.RunTimeTicks.HasValue || video.RunTimeTicks.Value < TimeSpan.FromMilliseconds(interval).Ticks)
-            {
-                return false;
-            }
-
-            var libraryOptions = _libraryManager.GetLibraryOptions(video);
-            if (libraryOptions is not null)
-            {
-                if (!libraryOptions.EnableTrickplayImageExtraction)
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                return false;
-            }
+        return tilesInfo;
+    }
 
-            // Can't extract images if there are no video streams
-            return video.GetMediaStreams().Count > 0;
+    private bool CanGenerateTrickplay(Video video, int interval)
+    {
+        var videoType = video.VideoType;
+        if (videoType == VideoType.Iso || videoType == VideoType.Dvd || videoType == VideoType.BluRay)
+        {
+            return false;
         }
 
-        /// <inheritdoc />
-        public Dictionary<int, TrickplayTilesInfo> GetTilesResolutions(Guid itemId)
+        if (video.IsPlaceHolder)
         {
-            return _itemRepo.GetTilesResolutions(itemId);
+            return false;
         }
 
-        /// <inheritdoc />
-        public void SaveTilesInfo(Guid itemId, TrickplayTilesInfo tilesInfo)
+        if (video.IsShortcut)
         {
-            _itemRepo.SaveTilesInfo(itemId, tilesInfo);
+            return false;
         }
 
-        /// <inheritdoc />
-        public Dictionary<Guid, Dictionary<int, TrickplayTilesInfo>> GetTrickplayManifest(BaseItem item)
+        if (!video.IsCompleteMedia)
         {
-            return _itemRepo.GetTrickplayManifest(item);
+            return false;
         }
 
-        /// <inheritdoc />
-        public string GetTrickplayTilePath(BaseItem item, int width, int index)
+        if (!video.RunTimeTicks.HasValue || video.RunTimeTicks.Value < TimeSpan.FromMilliseconds(interval).Ticks)
         {
-            return Path.Combine(GetTrickplayDirectory(item, width), index + ".jpg");
+            return false;
         }
 
-        private string GetTrickplayDirectory(BaseItem item, int? width = null)
+        var libraryOptions = _libraryManager.GetLibraryOptions(video);
+        if (libraryOptions is not null)
         {
-            var path = Path.Combine(item.GetInternalMetadataPath(), "trickplay");
-
-            return width.HasValue ? Path.Combine(path, width.Value.ToString(CultureInfo.InvariantCulture)) : path;
+            if (!libraryOptions.EnableTrickplayImageExtraction)
+            {
+                return false;
+            }
+        }
+        else
+        {
+            return false;
         }
 
-        private void MoveDirectory(string source, string destination)
+        // Can't extract images if there are no video streams
+        return video.GetMediaStreams().Count > 0;
+    }
+
+    /// <inheritdoc />
+    public Dictionary<int, TrickplayTilesInfo> GetTilesResolutions(Guid itemId)
+    {
+        return _itemRepo.GetTilesResolutions(itemId);
+    }
+
+    /// <inheritdoc />
+    public void SaveTilesInfo(Guid itemId, TrickplayTilesInfo tilesInfo)
+    {
+        _itemRepo.SaveTilesInfo(itemId, tilesInfo);
+    }
+
+    /// <inheritdoc />
+    public Dictionary<Guid, Dictionary<int, TrickplayTilesInfo>> GetTrickplayManifest(BaseItem item)
+    {
+        return _itemRepo.GetTrickplayManifest(item);
+    }
+
+    /// <inheritdoc />
+    public string GetTrickplayTilePath(BaseItem item, int width, int index)
+    {
+        return Path.Combine(GetTrickplayDirectory(item, width), index + ".jpg");
+    }
+
+    private string GetTrickplayDirectory(BaseItem item, int? width = null)
+    {
+        var path = Path.Combine(item.GetInternalMetadataPath(), "trickplay");
+
+        return width.HasValue ? Path.Combine(path, width.Value.ToString(CultureInfo.InvariantCulture)) : path;
+    }
+
+    private void MoveDirectory(string source, string destination)
+    {
+        try
         {
-            try
+            Directory.Move(source, destination);
+        }
+        catch (IOException)
+        {
+            // Cross device move requires a copy
+            Directory.CreateDirectory(destination);
+            foreach (string file in Directory.GetFiles(source))
             {
-                Directory.Move(source, destination);
+                File.Copy(file, Path.Join(destination, Path.GetFileName(file)), true);
             }
-            catch (IOException)
-            {
-                // Cross device move requires a copy
-                Directory.CreateDirectory(destination);
-                foreach (string file in Directory.GetFiles(source))
-                {
-                    File.Copy(file, Path.Join(destination, Path.GetFileName(file)), true);
-                }
 
-                Directory.Delete(source, true);
-            }
+            Directory.Delete(source, true);
         }
     }
 }
diff --git a/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs b/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs
index e29646725..d467c480e 100644
--- a/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs
+++ b/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs
@@ -10,118 +10,117 @@ using MediaBrowser.Controller.Trickplay;
 using MediaBrowser.Model.Configuration;
 using Microsoft.Extensions.Logging;
 
-namespace MediaBrowser.Providers.Trickplay
+namespace MediaBrowser.Providers.Trickplay;
+
+/// <summary>
+/// Class TrickplayProvider. Provides images and metadata for trickplay
+/// scrubbing previews.
+/// </summary>
+public class TrickplayProvider : ICustomMetadataProvider<Episode>,
+    ICustomMetadataProvider<MusicVideo>,
+    ICustomMetadataProvider<Movie>,
+    ICustomMetadataProvider<Trailer>,
+    ICustomMetadataProvider<Video>,
+    IHasItemChangeMonitor,
+    IHasOrder,
+    IForcedProvider
 {
+    private readonly ILogger<TrickplayProvider> _logger;
+    private readonly IServerConfigurationManager _config;
+    private readonly ITrickplayManager _trickplayManager;
+    private readonly ILibraryManager _libraryManager;
+
     /// <summary>
-    /// Class TrickplayProvider. Provides images and metadata for trickplay
-    /// scrubbing previews.
+    /// Initializes a new instance of the <see cref="TrickplayProvider"/> class.
     /// </summary>
-    public class TrickplayProvider : ICustomMetadataProvider<Episode>,
-        ICustomMetadataProvider<MusicVideo>,
-        ICustomMetadataProvider<Movie>,
-        ICustomMetadataProvider<Trailer>,
-        ICustomMetadataProvider<Video>,
-        IHasItemChangeMonitor,
-        IHasOrder,
-        IForcedProvider
+    /// <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)
     {
-        private readonly ILogger<TrickplayProvider> _logger;
-        private readonly IServerConfigurationManager _config;
-        private readonly ITrickplayManager _trickplayManager;
-        private readonly ILibraryManager _libraryManager;
-
-        /// <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;
-        }
+        _logger = logger;
+        _config = config;
+        _trickplayManager = trickplayManager;
+        _libraryManager = libraryManager;
+    }
 
-        /// <inheritdoc />
-        public string Name => "Trickplay Provider";
+    /// <inheritdoc />
+    public string Name => "Trickplay Provider";
 
-        /// <inheritdoc />
-        public int Order => 100;
+    /// <inheritdoc />
+    public int Order => 100;
 
-        /// <inheritdoc />
-        public bool HasChanged(BaseItem item, IDirectoryService directoryService)
+    /// <inheritdoc />
+    public bool HasChanged(BaseItem item, IDirectoryService directoryService)
+    {
+        if (item.IsFileProtocol)
         {
-            if (item.IsFileProtocol)
+            var file = directoryService.GetFile(item.Path);
+            if (file is not null && item.DateModified != file.LastWriteTimeUtc)
             {
-                var file = directoryService.GetFile(item.Path);
-                if (file is not null && item.DateModified != file.LastWriteTimeUtc)
-                {
-                    return true;
-                }
+                return true;
             }
-
-            return false;
         }
 
-        /// <inheritdoc />
-        public Task<ItemUpdateType> FetchAsync(Episode item, MetadataRefreshOptions options, CancellationToken cancellationToken)
-        {
-            return FetchInternal(item, options, cancellationToken);
-        }
+        return false;
+    }
 
-        /// <inheritdoc />
-        public Task<ItemUpdateType> FetchAsync(MusicVideo item, MetadataRefreshOptions options, CancellationToken cancellationToken)
-        {
-            return FetchInternal(item, options, cancellationToken);
-        }
+    /// <inheritdoc />
+    public Task<ItemUpdateType> FetchAsync(Episode item, MetadataRefreshOptions options, CancellationToken cancellationToken)
+    {
+        return FetchInternal(item, options, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        public Task<ItemUpdateType> FetchAsync(Movie item, MetadataRefreshOptions options, CancellationToken cancellationToken)
-        {
-            return FetchInternal(item, options, cancellationToken);
-        }
+    /// <inheritdoc />
+    public Task<ItemUpdateType> FetchAsync(MusicVideo item, MetadataRefreshOptions options, CancellationToken cancellationToken)
+    {
+        return FetchInternal(item, options, cancellationToken);
+    }
+
+    /// <inheritdoc />
+    public Task<ItemUpdateType> FetchAsync(Movie item, MetadataRefreshOptions options, CancellationToken cancellationToken)
+    {
+        return FetchInternal(item, options, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        public Task<ItemUpdateType> FetchAsync(Trailer item, MetadataRefreshOptions options, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public Task<ItemUpdateType> FetchAsync(Trailer item, MetadataRefreshOptions options, CancellationToken cancellationToken)
+    {
+        return FetchInternal(item, options, cancellationToken);
+    }
+
+    /// <inheritdoc />
+    public Task<ItemUpdateType> FetchAsync(Video item, MetadataRefreshOptions options, CancellationToken cancellationToken)
+    {
+        return FetchInternal(item, options, cancellationToken);
+    }
+
+    private async Task<ItemUpdateType> FetchInternal(Video video, MetadataRefreshOptions options, CancellationToken cancellationToken)
+    {
+        var libraryOptions = _libraryManager.GetLibraryOptions(video);
+        bool? enableDuringScan = libraryOptions?.ExtractTrickplayImagesDuringLibraryScan;
+        bool replace = options.ReplaceAllImages;
+
+        if (options.IsAutomated && !enableDuringScan.GetValueOrDefault(false))
         {
-            return FetchInternal(item, options, cancellationToken);
+            return ItemUpdateType.None;
         }
 
-        /// <inheritdoc />
-        public Task<ItemUpdateType> FetchAsync(Video item, MetadataRefreshOptions options, CancellationToken cancellationToken)
+        if (_config.Configuration.TrickplayOptions.ScanBehavior == TrickplayScanBehavior.Blocking)
         {
-            return FetchInternal(item, options, cancellationToken);
+            await _trickplayManager.RefreshTrickplayDataAsync(video, replace, cancellationToken).ConfigureAwait(false);
         }
-
-        private async Task<ItemUpdateType> FetchInternal(Video video, MetadataRefreshOptions options, CancellationToken cancellationToken)
+        else
         {
-            var libraryOptions = _libraryManager.GetLibraryOptions(video);
-            bool? enableDuringScan = libraryOptions?.ExtractTrickplayImagesDuringLibraryScan;
-            bool replace = options.ReplaceAllImages;
-
-            if (options.IsAutomated && !enableDuringScan.GetValueOrDefault(false))
-            {
-                return ItemUpdateType.None;
-            }
-
-            if (_config.Configuration.TrickplayOptions.ScanBehavior == TrickplayScanBehavior.Blocking)
-            {
-                await _trickplayManager.RefreshTrickplayData(video, replace, cancellationToken).ConfigureAwait(false);
-            }
-            else
-            {
-                _ = _trickplayManager.RefreshTrickplayData(video, replace, cancellationToken).ConfigureAwait(false);
-            }
-
-            // The core doesn't need to trigger any save operations over this
-            return ItemUpdateType.None;
+            _ = _trickplayManager.RefreshTrickplayDataAsync(video, replace, cancellationToken).ConfigureAwait(false);
         }
+
+        // The core doesn't need to trigger any save operations over this
+        return ItemUpdateType.None;
     }
 }
-- 
cgit v1.2.3


From f97e844c4fc2fb7626cc2e9fd706f9ce27d7c115 Mon Sep 17 00:00:00 2001
From: Nick <20588554+nicknsy@users.noreply.github.com>
Date: Mon, 4 Sep 2023 13:14:45 -0700
Subject: Minor code review changes (cvium)

---
 Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs | 2 +-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs            | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs b/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
index 107f8e510..b960feb7f 100644
--- a/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
+++ b/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
@@ -239,7 +239,7 @@ public class TrickplayManager : ITrickplayManager
             var tilePath = Path.Combine(workDir, $"{i}.jpg");
 
             imageOptions.OutputPath = tilePath;
-            imageOptions.InputPaths = images.Skip(i * thumbnailsPerTile).Take(thumbnailsPerTile).ToList();
+            imageOptions.InputPaths = images.GetRange(i * thumbnailsPerTile, Math.Min(thumbnailsPerTile, images.Count - (i * thumbnailsPerTile)));
 
             // Generate image and use returned height for tiles info
             var height = _imageEncoder.CreateTrickplayTile(imageOptions, options.JpegQuality, trickplayInfo.Width, trickplayInfo.Height != 0 ? trickplayInfo.Height : null);
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 000831fe2..fa695bbdc 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -925,8 +925,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                         cancellationToken.ThrowIfCancellationRequested();
 
-                        var jpegCount = _fileSystem.GetFilePaths(targetDirectory)
-                            .Count(i => string.Equals(Path.GetExtension(i), ".jpg", StringComparison.OrdinalIgnoreCase));
+                        var jpegCount = _fileSystem.GetFilePaths(targetDirectory).Count();
 
                         isResponsive = jpegCount > lastCount;
                         lastCount = jpegCount;
-- 
cgit v1.2.3


From b176beb88e22a36cc056439ac2a4df4fbe68f2c1 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Fri, 6 Oct 2023 00:40:09 +0200
Subject: Reduce string allocations

Some simple changes to reduce the number of allocated strings
---
 Emby.Dlna/DlnaManager.cs                           |  2 +-
 Emby.Naming/ExternalFiles/ExternalPathParser.cs    |  2 +-
 Emby.Naming/Video/StubResolver.cs                  |  7 ++---
 Emby.Photos/PhotoProvider.cs                       |  2 +-
 .../IO/ManagedFileSystem.cs                        |  6 ++--
 .../Library/LibraryManager.cs                      |  4 +--
 .../Library/Resolvers/Audio/AudioResolver.cs       |  6 ++--
 .../Library/Resolvers/BaseVideoResolver.cs         |  2 +-
 .../Library/Resolvers/Books/BookResolver.cs        |  9 +++---
 .../MediaEncoder/EncodingManager.cs                |  2 +-
 .../Playlists/PlaylistManager.cs                   | 16 ++++------
 .../Updates/InstallationManager.cs                 |  3 +-
 Jellyfin.Api/Controllers/DynamicHlsController.cs   |  4 +--
 Jellyfin.Api/Controllers/HlsSegmentController.cs   |  9 +++---
 Jellyfin.Api/Helpers/StreamingHelpers.cs           | 10 +++---
 Jellyfin.Api/Helpers/TranscodingJobHelper.cs       |  2 +-
 .../MediaEncoding/EncodingHelper.cs                | 18 +++++------
 .../Attachments/AttachmentExtractor.cs             | 36 +++-------------------
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |  6 ++--
 src/Jellyfin.Drawing.Skia/SkiaEncoder.cs           |  2 +-
 src/Jellyfin.Drawing.Skia/StripCollageBuilder.cs   | 12 ++++----
 21 files changed, 63 insertions(+), 97 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs
index 99b3e6e7e..d67cb67b5 100644
--- a/Emby.Dlna/DlnaManager.cs
+++ b/Emby.Dlna/DlnaManager.cs
@@ -228,7 +228,7 @@ namespace Emby.Dlna
             try
             {
                 return _fileSystem.GetFilePaths(path)
-                    .Where(i => string.Equals(Path.GetExtension(i), ".xml", StringComparison.OrdinalIgnoreCase))
+                    .Where(i => Path.GetExtension(i.AsSpan()).Equals(".xml", StringComparison.OrdinalIgnoreCase))
                     .Select(i => ParseProfileFile(i, type))
                     .Where(i => i is not null)
                     .ToList()!; // We just filtered out all the nulls
diff --git a/Emby.Naming/ExternalFiles/ExternalPathParser.cs b/Emby.Naming/ExternalFiles/ExternalPathParser.cs
index 953129671..4080ba10d 100644
--- a/Emby.Naming/ExternalFiles/ExternalPathParser.cs
+++ b/Emby.Naming/ExternalFiles/ExternalPathParser.cs
@@ -43,7 +43,7 @@ namespace Emby.Naming.ExternalFiles
                 return null;
             }
 
-            var extension = Path.GetExtension(path);
+            var extension = Path.GetExtension(path.AsSpan());
             if (!(_type == DlnaProfileType.Subtitle && _namingOptions.SubtitleFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
                 && !(_type == DlnaProfileType.Audio && _namingOptions.AudioFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase)))
             {
diff --git a/Emby.Naming/Video/StubResolver.cs b/Emby.Naming/Video/StubResolver.cs
index f7ba606e3..4b9df19b0 100644
--- a/Emby.Naming/Video/StubResolver.cs
+++ b/Emby.Naming/Video/StubResolver.cs
@@ -26,19 +26,18 @@ namespace Emby.Naming.Video
                 return false;
             }
 
-            var extension = Path.GetExtension(path);
+            var extension = Path.GetExtension(path.AsSpan());
 
             if (!options.StubFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
             {
                 return false;
             }
 
-            path = Path.GetFileNameWithoutExtension(path);
-            var token = Path.GetExtension(path).TrimStart('.');
+            var token = Path.GetExtension(Path.GetFileNameWithoutExtension(path.AsSpan())).TrimStart('.');
 
             foreach (var rule in options.StubTypes)
             {
-                if (string.Equals(rule.Token, token, StringComparison.OrdinalIgnoreCase))
+                if (token.Equals(rule.Token, StringComparison.OrdinalIgnoreCase))
                 {
                     stubType = rule.StubType;
                     return true;
diff --git a/Emby.Photos/PhotoProvider.cs b/Emby.Photos/PhotoProvider.cs
index f54066c57..27329a7f2 100644
--- a/Emby.Photos/PhotoProvider.cs
+++ b/Emby.Photos/PhotoProvider.cs
@@ -61,7 +61,7 @@ namespace Emby.Photos
             item.SetImagePath(ImageType.Primary, item.Path);
 
             // Examples: https://github.com/mono/taglib-sharp/blob/a5f6949a53d09ce63ee7495580d6802921a21f14/tests/fixtures/TagLib.Tests.Images/NullOrientationTest.cs
-            if (_includeExtensions.Contains(Path.GetExtension(item.Path), StringComparison.OrdinalIgnoreCase))
+            if (_includeExtensions.Contains(Path.GetExtension(item.Path.AsSpan()), StringComparison.OrdinalIgnoreCase))
             {
                 try
                 {
diff --git a/Emby.Server.Implementations/IO/ManagedFileSystem.cs b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
index 18b00ce0b..4178936ce 100644
--- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
@@ -103,15 +103,17 @@ namespace Emby.Server.Implementations.IO
                 return filePath;
             }
 
+            var filePathSpan = filePath.AsSpan();
+
             // relative path
             if (firstChar == '\\')
             {
-                filePath = filePath.Substring(1);
+                filePathSpan = filePathSpan.Slice(1);
             }
 
             try
             {
-                return Path.GetFullPath(Path.Combine(folderPath, filePath));
+                return Path.GetFullPath(Path.Join(folderPath, filePathSpan));
             }
             catch (ArgumentException)
             {
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index b0a4a4151..845e7e351 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -1162,7 +1162,7 @@ namespace Emby.Server.Implementations.Library
                 Name = Path.GetFileName(dir),
 
                 Locations = _fileSystem.GetFilePaths(dir, false)
-                .Where(i => string.Equals(ShortcutFileExtension, Path.GetExtension(i), StringComparison.OrdinalIgnoreCase))
+                .Where(i => Path.GetExtension(i.AsSpan()).Equals(ShortcutFileExtension, StringComparison.OrdinalIgnoreCase))
                     .Select(i =>
                     {
                         try
@@ -3135,7 +3135,7 @@ namespace Emby.Server.Implementations.Library
             }
 
             var shortcut = _fileSystem.GetFilePaths(virtualFolderPath, true)
-                .Where(i => string.Equals(ShortcutFileExtension, Path.GetExtension(i), StringComparison.OrdinalIgnoreCase))
+                .Where(i => Path.GetExtension(i.AsSpan()).Equals(ShortcutFileExtension, StringComparison.OrdinalIgnoreCase))
                 .FirstOrDefault(f => _appHost.ExpandVirtualPath(_fileSystem.ResolveShortcut(f)).Equals(mediaPath, StringComparison.OrdinalIgnoreCase));
 
             if (!string.IsNullOrEmpty(shortcut))
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
index a74f82475..862f144e6 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
@@ -94,9 +94,9 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
 
             if (AudioFileParser.IsAudioFile(args.Path, _namingOptions))
             {
-                var extension = Path.GetExtension(args.Path);
+                var extension = Path.GetExtension(args.Path.AsSpan());
 
-                if (string.Equals(extension, ".cue", StringComparison.OrdinalIgnoreCase))
+                if (extension.Equals(".cue", StringComparison.OrdinalIgnoreCase))
                 {
                     // if audio file exists of same name, return null
                     return null;
@@ -128,7 +128,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
 
                 if (item is not null)
                 {
-                    item.IsShortcut = string.Equals(extension, ".strm", StringComparison.OrdinalIgnoreCase);
+                    item.IsShortcut = extension.Equals(".strm", StringComparison.OrdinalIgnoreCase);
 
                     item.IsInMixedFolder = true;
                 }
diff --git a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
index 381796d0e..779cfd5be 100644
--- a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
@@ -263,7 +263,7 @@ namespace Emby.Server.Implementations.Library.Resolvers
                 return false;
             }
 
-            return directoryService.GetFilePaths(fullPath).Any(i => string.Equals(Path.GetExtension(i), ".vob", StringComparison.OrdinalIgnoreCase));
+            return directoryService.GetFilePaths(fullPath).Any(i => Path.GetExtension(i.AsSpan()).Equals(".vob", StringComparison.OrdinalIgnoreCase));
         }
 
         /// <summary>
diff --git a/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
index 042422c6f..73861ff59 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
@@ -32,9 +32,9 @@ namespace Emby.Server.Implementations.Library.Resolvers.Books
                 return GetBook(args);
             }
 
-            var extension = Path.GetExtension(args.Path);
+            var extension = Path.GetExtension(args.Path.AsSpan());
 
-            if (extension is not null && _validExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
+            if (_validExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
             {
                 // It's a book
                 return new Book
@@ -51,12 +51,11 @@ namespace Emby.Server.Implementations.Library.Resolvers.Books
         {
             var bookFiles = args.FileSystemChildren.Where(f =>
             {
-                var fileExtension = Path.GetExtension(f.FullName)
-                    ?? string.Empty;
+                var fileExtension = Path.GetExtension(f.FullName.AsSpan());
 
                 return _validExtensions.Contains(
                     fileExtension,
-                    StringComparer.OrdinalIgnoreCase);
+                    StringComparison.OrdinalIgnoreCase);
             }).ToList();
 
             // Don't return a Book if there is more (or less) than one document in the directory
diff --git a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
index 7732e32d0..896f47923 100644
--- a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
+++ b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
@@ -222,7 +222,7 @@ namespace Emby.Server.Implementations.MediaEncoder
         {
             var deadImages = images
                 .Except(chapters.Select(i => i.ImagePath).Where(i => !string.IsNullOrEmpty(i)), StringComparer.OrdinalIgnoreCase)
-                .Where(i => BaseItem.SupportedImageExtensions.Contains(Path.GetExtension(i), StringComparison.OrdinalIgnoreCase))
+                .Where(i => BaseItem.SupportedImageExtensions.Contains(Path.GetExtension(i.AsSpan()), StringComparison.OrdinalIgnoreCase))
                 .ToList();
 
             foreach (var image in deadImages)
diff --git a/Emby.Server.Implementations/Playlists/PlaylistManager.cs b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
index 0cb450cdf..649c49924 100644
--- a/Emby.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
@@ -327,9 +327,9 @@ namespace Emby.Server.Implementations.Playlists
             // this is probably best done as a metadata provider
             // saving a file over itself will require some work to prevent this from happening when not needed
             var playlistPath = item.Path;
-            var extension = Path.GetExtension(playlistPath);
+            var extension = Path.GetExtension(playlistPath.AsSpan());
 
-            if (string.Equals(".wpl", extension, StringComparison.OrdinalIgnoreCase))
+            if (extension.Equals(".wpl", StringComparison.OrdinalIgnoreCase))
             {
                 var playlist = new WplPlaylist();
                 foreach (var child in item.GetLinkedChildren())
@@ -362,8 +362,7 @@ namespace Emby.Server.Implementations.Playlists
                 string text = new WplContent().ToText(playlist);
                 File.WriteAllText(playlistPath, text);
             }
-
-            if (string.Equals(".zpl", extension, StringComparison.OrdinalIgnoreCase))
+            else if (extension.Equals(".zpl", StringComparison.OrdinalIgnoreCase))
             {
                 var playlist = new ZplPlaylist();
                 foreach (var child in item.GetLinkedChildren())
@@ -396,8 +395,7 @@ namespace Emby.Server.Implementations.Playlists
                 string text = new ZplContent().ToText(playlist);
                 File.WriteAllText(playlistPath, text);
             }
-
-            if (string.Equals(".m3u", extension, StringComparison.OrdinalIgnoreCase))
+            else if (extension.Equals(".m3u", StringComparison.OrdinalIgnoreCase))
             {
                 var playlist = new M3uPlaylist
                 {
@@ -428,8 +426,7 @@ namespace Emby.Server.Implementations.Playlists
                 string text = new M3uContent().ToText(playlist);
                 File.WriteAllText(playlistPath, text);
             }
-
-            if (string.Equals(".m3u8", extension, StringComparison.OrdinalIgnoreCase))
+            else if (extension.Equals(".m3u8", StringComparison.OrdinalIgnoreCase))
             {
                 var playlist = new M3uPlaylist();
                 playlist.IsExtended = true;
@@ -458,8 +455,7 @@ namespace Emby.Server.Implementations.Playlists
                 string text = new M3uContent().ToText(playlist);
                 File.WriteAllText(playlistPath, text);
             }
-
-            if (string.Equals(".pls", extension, StringComparison.OrdinalIgnoreCase))
+            else if (extension.Equals(".pls", StringComparison.OrdinalIgnoreCase))
             {
                 var playlist = new PlsPlaylist();
                 foreach (var child in item.GetLinkedChildren())
diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 6c198b6f9..77d385ba1 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -504,8 +504,7 @@ namespace Emby.Server.Implementations.Updates
 
         private async Task PerformPackageInstallation(InstallationInfo package, PluginStatus status, CancellationToken cancellationToken)
         {
-            var extension = Path.GetExtension(package.SourceUrl);
-            if (!string.Equals(extension, ".zip", StringComparison.OrdinalIgnoreCase))
+            if (!Path.GetExtension(package.SourceUrl.AsSpan()).Equals(".zip", StringComparison.OrdinalIgnoreCase))
             {
                 _logger.LogError("Only zip packages are supported. {SourceUrl} is not a zip archive.", package.SourceUrl);
                 return;
diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs
index 065a4ce5c..4026a38f8 100644
--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs
+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs
@@ -2041,9 +2041,9 @@ public class DynamicHlsController : BaseJellyfinApiController
             return null;
         }
 
-        var playlistFilename = Path.GetFileNameWithoutExtension(playlist);
+        var playlistFilename = Path.GetFileNameWithoutExtension(playlist.AsSpan());
 
-        var indexString = Path.GetFileNameWithoutExtension(file.Name).Substring(playlistFilename.Length);
+        var indexString = Path.GetFileNameWithoutExtension(file.Name.AsSpan()).Slice(playlistFilename.Length);
 
         return int.Parse(indexString, NumberStyles.Integer, CultureInfo.InvariantCulture);
     }
diff --git a/Jellyfin.Api/Controllers/HlsSegmentController.cs b/Jellyfin.Api/Controllers/HlsSegmentController.cs
index d7cec865e..6eedfd8c7 100644
--- a/Jellyfin.Api/Controllers/HlsSegmentController.cs
+++ b/Jellyfin.Api/Controllers/HlsSegmentController.cs
@@ -59,7 +59,7 @@ public class HlsSegmentController : BaseJellyfinApiController
     public ActionResult GetHlsAudioSegmentLegacy([FromRoute, Required] string itemId, [FromRoute, Required] string segmentId)
     {
         // TODO: Deprecate with new iOS app
-        var file = segmentId + Path.GetExtension(Request.Path);
+        var file = string.Concat(segmentId, Path.GetExtension(Request.Path.Value.AsSpan()));
         var transcodePath = _serverConfigurationManager.GetTranscodePath();
         file = Path.GetFullPath(Path.Combine(transcodePath, file));
         var fileDir = Path.GetDirectoryName(file);
@@ -85,11 +85,12 @@ public class HlsSegmentController : BaseJellyfinApiController
     [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "itemId", Justification = "Required for ServiceStack")]
     public ActionResult GetHlsPlaylistLegacy([FromRoute, Required] string itemId, [FromRoute, Required] string playlistId)
     {
-        var file = playlistId + Path.GetExtension(Request.Path);
+        var file = string.Concat(playlistId, Path.GetExtension(Request.Path.Value.AsSpan()));
         var transcodePath = _serverConfigurationManager.GetTranscodePath();
         file = Path.GetFullPath(Path.Combine(transcodePath, file));
         var fileDir = Path.GetDirectoryName(file);
-        if (string.IsNullOrEmpty(fileDir) || !fileDir.StartsWith(transcodePath, StringComparison.InvariantCulture) || Path.GetExtension(file) != ".m3u8")
+        if (string.IsNullOrEmpty(fileDir) || !fileDir.StartsWith(transcodePath, StringComparison.InvariantCulture)
+            || Path.GetExtension(file.AsSpan()).Equals(".m3u8", StringComparison.OrdinalIgnoreCase))
         {
             return BadRequest("Invalid segment.");
         }
@@ -138,7 +139,7 @@ public class HlsSegmentController : BaseJellyfinApiController
         [FromRoute, Required] string segmentId,
         [FromRoute, Required] string segmentContainer)
     {
-        var file = segmentId + Path.GetExtension(Request.Path);
+        var file = string.Concat(segmentId, Path.GetExtension(Request.Path.Value.AsSpan()));
         var transcodeFolderPath = _serverConfigurationManager.GetTranscodePath();
 
         file = Path.GetFullPath(Path.Combine(transcodeFolderPath, file));
diff --git a/Jellyfin.Api/Helpers/StreamingHelpers.cs b/Jellyfin.Api/Helpers/StreamingHelpers.cs
index 782cd6568..d15fe4fab 100644
--- a/Jellyfin.Api/Helpers/StreamingHelpers.cs
+++ b/Jellyfin.Api/Helpers/StreamingHelpers.cs
@@ -243,7 +243,7 @@ public static class StreamingHelpers
             ? GetOutputFileExtension(state, mediaSource)
             : ("." + state.OutputContainer);
 
-        state.OutputFilePath = GetOutputFilePath(state, ext!, serverConfigurationManager, streamingRequest.DeviceId, streamingRequest.PlaySessionId);
+        state.OutputFilePath = GetOutputFilePath(state, ext, serverConfigurationManager, streamingRequest.DeviceId, streamingRequest.PlaySessionId);
 
         return state;
     }
@@ -418,11 +418,11 @@ public static class StreamingHelpers
     /// <returns>System.String.</returns>
     private static string? GetOutputFileExtension(StreamState state, MediaSourceInfo? mediaSource)
     {
-        var ext = Path.GetExtension(state.RequestedUrl);
+        var ext = Path.GetExtension(state.RequestedUrl.AsSpan());
 
-        if (!string.IsNullOrEmpty(ext))
+        if (ext.IsEmpty)
         {
-            return ext;
+            return null;
         }
 
         // Try to infer based on the desired video codec
@@ -504,7 +504,7 @@ public static class StreamingHelpers
     /// <param name="deviceId">The device id.</param>
     /// <param name="playSessionId">The play session id.</param>
     /// <returns>The complete file path, including the folder, for the transcoding file.</returns>
-    private static string GetOutputFilePath(StreamState state, string outputFileExtension, IServerConfigurationManager serverConfigurationManager, string? deviceId, string? playSessionId)
+    private static string GetOutputFilePath(StreamState state, string? outputFileExtension, IServerConfigurationManager serverConfigurationManager, string? deviceId, string? playSessionId)
     {
         var data = $"{state.MediaPath}-{state.UserAgent}-{deviceId!}-{playSessionId!}";
 
diff --git a/Jellyfin.Api/Helpers/TranscodingJobHelper.cs b/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
index 73ebb396d..c16a586d6 100644
--- a/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
+++ b/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
@@ -538,7 +538,7 @@ public class TranscodingJobHelper : IDisposable
                 await _attachmentExtractor.ExtractAllAttachments(state.MediaPath, state.MediaSource, attachmentPath, cancellationTokenSource.Token).ConfigureAwait(false);
             }
 
-            if (state.SubtitleStream.IsExternal && string.Equals(Path.GetExtension(state.SubtitleStream.Path), ".mks", StringComparison.OrdinalIgnoreCase))
+            if (state.SubtitleStream.IsExternal && Path.GetExtension(state.SubtitleStream.Path.AsSpan()).Equals(".mks", StringComparison.OrdinalIgnoreCase))
             {
                 string subtitlePath = state.SubtitleStream.Path;
                 string subtitlePathArgument = string.Format(CultureInfo.InvariantCulture, "file:\"{0}\"", subtitlePath.Replace("\"", "\\\"", StringComparison.Ordinal));
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index c311d3b8a..3be7a4252 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -548,25 +548,25 @@ namespace MediaBrowser.Controller.MediaEncoding
         /// <returns>System.Nullable{VideoCodecs}.</returns>
         public string InferVideoCodec(string url)
         {
-            var ext = Path.GetExtension(url);
+            var ext = Path.GetExtension(url.AsSpan());
 
-            if (string.Equals(ext, ".asf", StringComparison.OrdinalIgnoreCase))
+            if (ext.Equals(".asf", StringComparison.OrdinalIgnoreCase))
             {
                 return "wmv";
             }
 
-            if (string.Equals(ext, ".webm", StringComparison.OrdinalIgnoreCase))
+            if (ext.Equals(".webm", StringComparison.OrdinalIgnoreCase))
             {
                 // TODO: this may not always mean VP8, as the codec ages
                 return "vp8";
             }
 
-            if (string.Equals(ext, ".ogg", StringComparison.OrdinalIgnoreCase) || string.Equals(ext, ".ogv", StringComparison.OrdinalIgnoreCase))
+            if (ext.Equals(".ogg", StringComparison.OrdinalIgnoreCase) || ext.Equals(".ogv", StringComparison.OrdinalIgnoreCase))
             {
                 return "theora";
             }
 
-            if (string.Equals(ext, ".m3u8", StringComparison.OrdinalIgnoreCase) || string.Equals(ext, ".ts", StringComparison.OrdinalIgnoreCase))
+            if (ext.Equals(".m3u8", StringComparison.OrdinalIgnoreCase) || ext.Equals(".ts", StringComparison.OrdinalIgnoreCase))
             {
                 return "h264";
             }
@@ -1080,10 +1080,10 @@ namespace MediaBrowser.Controller.MediaEncoding
                 && state.SubtitleStream.IsExternal)
             {
                 var subtitlePath = state.SubtitleStream.Path;
-                var subtitleExtension = Path.GetExtension(subtitlePath);
+                var subtitleExtension = Path.GetExtension(subtitlePath.AsSpan());
 
-                if (string.Equals(subtitleExtension, ".sub", StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(subtitleExtension, ".sup", StringComparison.OrdinalIgnoreCase))
+                if (subtitleExtension.Equals(".sub", StringComparison.OrdinalIgnoreCase)
+                    || subtitleExtension.Equals(".sup", StringComparison.OrdinalIgnoreCase))
                 {
                     var idxFile = Path.ChangeExtension(subtitlePath, ".idx");
                     if (File.Exists(idxFile))
@@ -6033,7 +6033,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var format = string.Empty;
             var keyFrame = string.Empty;
 
-            if (string.Equals(Path.GetExtension(outputPath), ".mp4", StringComparison.OrdinalIgnoreCase)
+            if (Path.GetExtension(outputPath.AsSpan()).Equals(".mp4", StringComparison.OrdinalIgnoreCase)
                 && state.BaseRequest.Context == EncodingContext.Streaming)
             {
                 // Comparison: https://github.com/jansmolders86/mediacenterjs/blob/master/lib/transcoding/desktop.js
diff --git a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
index 989e386a5..0ec0c84d4 100644
--- a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
+++ b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
@@ -1,4 +1,3 @@
-#nullable disable
 #pragma warning disable CS1591
 
 using System;
@@ -23,7 +22,7 @@ using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.MediaEncoding.Attachments
 {
-    public class AttachmentExtractor : IAttachmentExtractor, IDisposable
+    public sealed class AttachmentExtractor : IAttachmentExtractor
     {
         private readonly ILogger<AttachmentExtractor> _logger;
         private readonly IApplicationPaths _appPaths;
@@ -34,8 +33,6 @@ namespace MediaBrowser.MediaEncoding.Attachments
         private readonly ConcurrentDictionary<string, SemaphoreSlim> _semaphoreLocks =
             new ConcurrentDictionary<string, SemaphoreSlim>();
 
-        private bool _disposed = false;
-
         public AttachmentExtractor(
             ILogger<AttachmentExtractor> logger,
             IApplicationPaths appPaths,
@@ -296,7 +293,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
 
             ArgumentException.ThrowIfNullOrEmpty(outputPath);
 
-            Directory.CreateDirectory(Path.GetDirectoryName(outputPath));
+            Directory.CreateDirectory(Path.GetDirectoryName(outputPath) ?? throw new ArgumentException("Path can't be a root directory.", nameof(outputPath)));
 
             var processArgs = string.Format(
                 CultureInfo.InvariantCulture,
@@ -391,33 +388,8 @@ namespace MediaBrowser.MediaEncoding.Attachments
                 filename = (mediaPath + attachmentStreamIndex.ToString(CultureInfo.InvariantCulture)).GetMD5().ToString("D", CultureInfo.InvariantCulture);
             }
 
-            var prefix = filename.Substring(0, 1);
-            return Path.Combine(_appPaths.DataPath, "attachments", prefix, filename);
-        }
-
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (disposing)
-            {
-            }
-
-            _disposed = true;
+            var prefix = filename.AsSpan(0, 1);
+            return Path.Join(_appPaths.DataPath, "attachments", prefix, filename);
         }
     }
 }
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 346e97ae1..59c350561 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -316,10 +316,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
             {
                 var files = _fileSystem.GetFilePaths(path, recursive);
 
-                var excludeExtensions = new[] { ".c" };
-
-                return files.FirstOrDefault(i => string.Equals(Path.GetFileNameWithoutExtension(i), filename, StringComparison.OrdinalIgnoreCase)
-                                                    && !excludeExtensions.Contains(Path.GetExtension(i) ?? string.Empty));
+                return files.FirstOrDefault(i => Path.GetFileNameWithoutExtension(i.AsSpan()).Equals(filename, StringComparison.OrdinalIgnoreCase)
+                                                    && !Path.GetExtension(i.AsSpan()).Equals(".c", StringComparison.OrdinalIgnoreCase));
             }
             catch (Exception)
             {
diff --git a/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs b/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
index 126c0503e..416f60217 100644
--- a/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
+++ b/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
@@ -188,7 +188,7 @@ public class SkiaEncoder : IImageEncoder
             return path;
         }
 
-        var tempPath = Path.Combine(_appPaths.TempDirectory, Guid.NewGuid() + Path.GetExtension(path));
+        var tempPath = Path.Combine(_appPaths.TempDirectory, string.Concat(Guid.NewGuid().ToString(), Path.GetExtension(path.AsSpan())));
         var directory = Path.GetDirectoryName(tempPath) ?? throw new ResourceNotFoundException($"Provided path ({tempPath}) is not valid.");
         Directory.CreateDirectory(directory);
         File.Copy(path, tempPath, true);
diff --git a/src/Jellyfin.Drawing.Skia/StripCollageBuilder.cs b/src/Jellyfin.Drawing.Skia/StripCollageBuilder.cs
index 6dff7aa9b..4aff26c16 100644
--- a/src/Jellyfin.Drawing.Skia/StripCollageBuilder.cs
+++ b/src/Jellyfin.Drawing.Skia/StripCollageBuilder.cs
@@ -38,25 +38,25 @@ public partial class StripCollageBuilder
     {
         ArgumentNullException.ThrowIfNull(outputPath);
 
-        var ext = Path.GetExtension(outputPath);
+        var ext = Path.GetExtension(outputPath.AsSpan());
 
-        if (string.Equals(ext, ".jpg", StringComparison.OrdinalIgnoreCase)
-            || string.Equals(ext, ".jpeg", StringComparison.OrdinalIgnoreCase))
+        if (ext.Equals(".jpg", StringComparison.OrdinalIgnoreCase)
+            || ext.Equals(".jpeg", StringComparison.OrdinalIgnoreCase))
         {
             return SKEncodedImageFormat.Jpeg;
         }
 
-        if (string.Equals(ext, ".webp", StringComparison.OrdinalIgnoreCase))
+        if (ext.Equals(".webp", StringComparison.OrdinalIgnoreCase))
         {
             return SKEncodedImageFormat.Webp;
         }
 
-        if (string.Equals(ext, ".gif", StringComparison.OrdinalIgnoreCase))
+        if (ext.Equals(".gif", StringComparison.OrdinalIgnoreCase))
         {
             return SKEncodedImageFormat.Gif;
         }
 
-        if (string.Equals(ext, ".bmp", StringComparison.OrdinalIgnoreCase))
+        if (ext.Equals(".bmp", StringComparison.OrdinalIgnoreCase))
         {
             return SKEncodedImageFormat.Bmp;
         }
-- 
cgit v1.2.3


From 0870af330df1040eddf76ae2b7cde3e97061b745 Mon Sep 17 00:00:00 2001
From: Stepan Goremykin <goremukin@gmail.com>
Date: Sun, 8 Oct 2023 00:15:38 +0200
Subject: Remove redundant verbatim string prefixes

---
 Emby.Naming/Common/NamingOptions.cs                |   8 +-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |   2 +-
 MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs |   2 +-
 .../AudioBook/AudioBookResolverTests.cs            |   8 +-
 .../ExternalFiles/ExternalPathParserTests.cs       |   6 +-
 .../Music/MultiDiscAlbumTests.cs                   |  56 +++----
 .../Jellyfin.Naming.Tests/TV/DailyEpisodeTests.cs  |  10 +-
 .../TV/EpisodeNumberWithoutSeasonTests.cs          |  20 +--
 .../Jellyfin.Naming.Tests/TV/MultiEpisodeTests.cs  | 114 +++++++-------
 .../Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs  |  34 ++--
 .../Jellyfin.Naming.Tests/TV/SeasonNumberTests.cs  |   4 +-
 .../Jellyfin.Naming.Tests/TV/SimpleEpisodeTests.cs |   4 +-
 .../Video/CleanDateTimeTests.cs                    |  60 +++----
 tests/Jellyfin.Naming.Tests/Video/Format3DTests.cs |   2 +-
 .../Video/MultiVersionTests.cs                     | 172 ++++++++++-----------
 tests/Jellyfin.Naming.Tests/Video/StackTests.cs    |   4 +-
 tests/Jellyfin.Naming.Tests/Video/StubTests.cs     |   2 +-
 .../Video/VideoListResolverTests.cs                |  56 +++----
 .../Video/VideoResolverTests.cs                    |  36 ++---
 .../Manager/ItemImageProviderTests.cs              |   4 +-
 .../MediaInfo/MediaInfoResolverTests.cs            |   8 +-
 21 files changed, 306 insertions(+), 306 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/Emby.Naming/Common/NamingOptions.cs b/Emby.Naming/Common/NamingOptions.cs
index 2bd089ed8..692edae4a 100644
--- a/Emby.Naming/Common/NamingOptions.cs
+++ b/Emby.Naming/Common/NamingOptions.cs
@@ -318,7 +318,7 @@ namespace Emby.Naming.Common
                 new EpisodeExpression(@"[\._ -]()[Ee][Pp]_?([0-9]+)([^\\/]*)$"),
                 // <!-- foo.E01., foo.e01. -->
                 new EpisodeExpression(@"[^\\/]*?()\.?[Ee]([0-9]+)\.([^\\/]*)$"),
-                new EpisodeExpression(@"(?<year>[0-9]{4})[._ -](?<month>[0-9]{2})[._ -](?<day>[0-9]{2})", true)
+                new EpisodeExpression("(?<year>[0-9]{4})[._ -](?<month>[0-9]{2})[._ -](?<day>[0-9]{2})", true)
                 {
                     DateTimeFormats = new[]
                     {
@@ -328,7 +328,7 @@ namespace Emby.Naming.Common
                         "yyyy MM dd"
                     }
                 },
-                new EpisodeExpression(@"(?<day>[0-9]{2})[._ -](?<month>[0-9]{2})[._ -](?<year>[0-9]{4})", true)
+                new EpisodeExpression("(?<day>[0-9]{2})[._ -](?<month>[0-9]{2})[._ -](?<year>[0-9]{4})", true)
                 {
                     DateTimeFormats = new[]
                     {
@@ -417,7 +417,7 @@ namespace Emby.Naming.Common
                 },
 
                 // "1-12 episode title"
-                new EpisodeExpression(@"([0-9]+)-([0-9]+)"),
+                new EpisodeExpression("([0-9]+)-([0-9]+)"),
 
                 // "01 - blah.avi", "01-blah.avi"
                 new EpisodeExpression(@".*(\\|\/)(?<epnumber>[0-9]{1,3})(-(?<endingepnumber>[0-9]{2,3}))*\s?-\s?[^\\\/]*$")
@@ -712,7 +712,7 @@ namespace Emby.Naming.Common
                 // Chapter is often beginning of filename
                 "^(?<chapter>[0-9]+)",
                 // Part if often ending of filename
-                @"(?<!ch(?:apter) )(?<part>[0-9]+)$",
+                "(?<!ch(?:apter) )(?<part>[0-9]+)$",
                 // Sometimes named as 0001_005 (chapter_part)
                 "(?<chapter>[0-9]+)_(?<part>[0-9]+)",
                 // Some audiobooks are ripped from cd's, and will be named by disk number.
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 90ef93720..9bd99f030 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -177,7 +177,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             if (_ffmpegPath is not null)
             {
                 // Determine a probe path from the mpeg path
-                _ffprobePath = FfprobePathRegex().Replace(_ffmpegPath, @"ffprobe$1");
+                _ffprobePath = FfprobePathRegex().Replace(_ffmpegPath, "ffprobe$1");
 
                 // Interrogate to understand what coders are supported
                 var validator = new EncoderValidator(_logger, _ffmpegPath);
diff --git a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
index 5b68924ac..af01b8be2 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
@@ -159,7 +159,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
             // Find last closing Tag
             // Need to do this in two steps to account for random > characters after the closing xml
-            var index = xml.LastIndexOf(@"</", StringComparison.Ordinal);
+            var index = xml.LastIndexOf("</", StringComparison.Ordinal);
 
             // If closing tag exists, move to end of Tag
             if (index != -1)
diff --git a/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs b/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs
index c72a3315e..9b9c1ec34 100644
--- a/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs
+++ b/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs
@@ -14,18 +14,18 @@ namespace Jellyfin.Naming.Tests.AudioBook
 
             data.Add(
                 new AudioBookFileInfo(
-                    @"/server/AudioBooks/Larry Potter/Larry Potter.mp3",
+                    "/server/AudioBooks/Larry Potter/Larry Potter.mp3",
                     "mp3"));
 
             data.Add(
                 new AudioBookFileInfo(
-                    @"/server/AudioBooks/Berry Potter/Chapter 1 .ogg",
+                    "/server/AudioBooks/Berry Potter/Chapter 1 .ogg",
                     "ogg",
                     chapterNumber: 1));
 
             data.Add(
                 new AudioBookFileInfo(
-                    @"/server/AudioBooks/Nerry Potter/Part 3 - Chapter 2.mp3",
+                    "/server/AudioBooks/Nerry Potter/Part 3 - Chapter 2.mp3",
                     "mp3",
                     chapterNumber: 2,
                     partNumber: 3));
@@ -49,7 +49,7 @@ namespace Jellyfin.Naming.Tests.AudioBook
         [Fact]
         public void Resolve_InvalidExtension()
         {
-            var result = new AudioBookResolver(_namingOptions).Resolve(@"/server/AudioBooks/Larry Potter/Larry Potter.mp9");
+            var result = new AudioBookResolver(_namingOptions).Resolve("/server/AudioBooks/Larry Potter/Larry Potter.mp9");
 
             Assert.Null(result);
         }
diff --git a/tests/Jellyfin.Naming.Tests/ExternalFiles/ExternalPathParserTests.cs b/tests/Jellyfin.Naming.Tests/ExternalFiles/ExternalPathParserTests.cs
index 97949adff..ba602b5d2 100644
--- a/tests/Jellyfin.Naming.Tests/ExternalFiles/ExternalPathParserTests.cs
+++ b/tests/Jellyfin.Naming.Tests/ExternalFiles/ExternalPathParserTests.cs
@@ -20,11 +20,11 @@ public class ExternalPathParserTests
         var hindiCultureDto = new CultureDto("Hindi", "Hindi", "hi", new[] { "hin" });
 
         var localizationManager = new Mock<ILocalizationManager>(MockBehavior.Loose);
-        localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex(@"en.*", RegexOptions.IgnoreCase)))
+        localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex("en.*", RegexOptions.IgnoreCase)))
             .Returns(englishCultureDto);
-        localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex(@"fr.*", RegexOptions.IgnoreCase)))
+        localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex("fr.*", RegexOptions.IgnoreCase)))
             .Returns(frenchCultureDto);
-        localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex(@"hi.*", RegexOptions.IgnoreCase)))
+        localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex("hi.*", RegexOptions.IgnoreCase)))
             .Returns(hindiCultureDto);
 
         _audioPathParser = new ExternalPathParser(new NamingOptions(), localizationManager.Object, DlnaProfileType.Audio);
diff --git a/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs b/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs
index c9a295a4c..471616797 100644
--- a/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs
@@ -12,34 +12,34 @@ namespace Jellyfin.Naming.Tests.Music
         [InlineData("", false)]
         [InlineData("C:/", false)]
         [InlineData("/home/", false)]
-        [InlineData(@"blah blah", false)]
-        [InlineData(@"D:/music/weezer/03 Pinkerton", false)]
-        [InlineData(@"D:/music/michael jackson/Bad (2012 Remaster)", false)]
-        [InlineData(@"cd1", true)]
-        [InlineData(@"disc18", true)]
-        [InlineData(@"disk10", true)]
-        [InlineData(@"vol7", true)]
-        [InlineData(@"volume1", true)]
-        [InlineData(@"cd 1", true)]
-        [InlineData(@"disc 1", true)]
-        [InlineData(@"disk 1", true)]
-        [InlineData(@"disk", false)]
-        [InlineData(@"disk ·", false)]
-        [InlineData(@"disk a", false)]
-        [InlineData(@"disk volume", false)]
-        [InlineData(@"disc disc", false)]
-        [InlineData(@"disk disc 6", false)]
-        [InlineData(@"cd  - 1", true)]
-        [InlineData(@"disc- 1", true)]
-        [InlineData(@"disk - 1", true)]
-        [InlineData(@"Disc 01 (Hugo Wolf · 24 Lieder)", true)]
-        [InlineData(@"Disc 04 (Encores and Folk Songs)", true)]
-        [InlineData(@"Disc04 (Encores and Folk Songs)", true)]
-        [InlineData(@"Disc 04(Encores and Folk Songs)", true)]
-        [InlineData(@"Disc04(Encores and Folk Songs)", true)]
-        [InlineData(@"D:/Video/MBTestLibrary/VideoTest/music/.38 special/anth/Disc 2", true)]
-        [InlineData(@"[1985] Opportunities (Let's make lots of money) (1985)", false)]
-        [InlineData(@"Blah 04(Encores and Folk Songs)", false)]
+        [InlineData("blah blah", false)]
+        [InlineData("D:/music/weezer/03 Pinkerton", false)]
+        [InlineData("D:/music/michael jackson/Bad (2012 Remaster)", false)]
+        [InlineData("cd1", true)]
+        [InlineData("disc18", true)]
+        [InlineData("disk10", true)]
+        [InlineData("vol7", true)]
+        [InlineData("volume1", true)]
+        [InlineData("cd 1", true)]
+        [InlineData("disc 1", true)]
+        [InlineData("disk 1", true)]
+        [InlineData("disk", false)]
+        [InlineData("disk ·", false)]
+        [InlineData("disk a", false)]
+        [InlineData("disk volume", false)]
+        [InlineData("disc disc", false)]
+        [InlineData("disk disc 6", false)]
+        [InlineData("cd  - 1", true)]
+        [InlineData("disc- 1", true)]
+        [InlineData("disk - 1", true)]
+        [InlineData("Disc 01 (Hugo Wolf · 24 Lieder)", true)]
+        [InlineData("Disc 04 (Encores and Folk Songs)", true)]
+        [InlineData("Disc04 (Encores and Folk Songs)", true)]
+        [InlineData("Disc 04(Encores and Folk Songs)", true)]
+        [InlineData("Disc04(Encores and Folk Songs)", true)]
+        [InlineData("D:/Video/MBTestLibrary/VideoTest/music/.38 special/anth/Disc 2", true)]
+        [InlineData("[1985] Opportunities (Let's make lots of money) (1985)", false)]
+        [InlineData("Blah 04(Encores and Folk Songs)", false)]
         public void AlbumParser_MultidiscPath_Identifies(string path, bool result)
         {
             var parser = new AlbumParser(_namingOptions);
diff --git a/tests/Jellyfin.Naming.Tests/TV/DailyEpisodeTests.cs b/tests/Jellyfin.Naming.Tests/TV/DailyEpisodeTests.cs
index d0d3d8292..f2cd360e5 100644
--- a/tests/Jellyfin.Naming.Tests/TV/DailyEpisodeTests.cs
+++ b/tests/Jellyfin.Naming.Tests/TV/DailyEpisodeTests.cs
@@ -9,11 +9,11 @@ namespace Jellyfin.Naming.Tests.TV
         private readonly EpisodeResolver _resolver = new EpisodeResolver(new NamingOptions());
 
         [Theory]
-        [InlineData(@"/server/anything_1996.11.14.mp4", "anything", 1996, 11, 14)]
-        [InlineData(@"/server/anything_1996-11-14.mp4", "anything", 1996, 11, 14)]
-        [InlineData(@"/server/james.corden.2017.04.20.anne.hathaway.720p.hdtv.x264-crooks.mkv", "james.corden", 2017, 04, 20)]
-        [InlineData(@"/server/ABC News 2018_03_24_19_00_00.mkv", "ABC News", 2018, 03, 24)]
-        [InlineData(@"/server/Jeopardy 2023 07 14 HDTV x264 AC3.mkv", "Jeopardy", 2023, 07, 14)]
+        [InlineData("/server/anything_1996.11.14.mp4", "anything", 1996, 11, 14)]
+        [InlineData("/server/anything_1996-11-14.mp4", "anything", 1996, 11, 14)]
+        [InlineData("/server/james.corden.2017.04.20.anne.hathaway.720p.hdtv.x264-crooks.mkv", "james.corden", 2017, 04, 20)]
+        [InlineData("/server/ABC News 2018_03_24_19_00_00.mkv", "ABC News", 2018, 03, 24)]
+        [InlineData("/server/Jeopardy 2023 07 14 HDTV x264 AC3.mkv", "Jeopardy", 2023, 07, 14)]
         // TODO: [InlineData(@"/server/anything_14.11.1996.mp4", "anything", 1996, 11, 14)]
         // TODO: [InlineData(@"/server/A Daily Show - (2015-01-15) - Episode Name - [720p].mkv", "A Daily Show", 2015, 01, 15)]
         // TODO: [InlineData(@"/server/Last Man Standing_KTLADT_2018_05_25_01_28_00.wtv", "Last Man Standing", 2018, 05, 25)]
diff --git a/tests/Jellyfin.Naming.Tests/TV/EpisodeNumberWithoutSeasonTests.cs b/tests/Jellyfin.Naming.Tests/TV/EpisodeNumberWithoutSeasonTests.cs
index 1da5a30a8..1727b2247 100644
--- a/tests/Jellyfin.Naming.Tests/TV/EpisodeNumberWithoutSeasonTests.cs
+++ b/tests/Jellyfin.Naming.Tests/TV/EpisodeNumberWithoutSeasonTests.cs
@@ -9,16 +9,16 @@ namespace Jellyfin.Naming.Tests.TV
         private readonly EpisodeResolver _resolver = new EpisodeResolver(new NamingOptions());
 
         [Theory]
-        [InlineData(8, @"The Simpsons/The Simpsons.S25E08.Steal this episode.mp4")]
-        [InlineData(2, @"The Simpsons/The Simpsons - 02 - Ep Name.avi")]
-        [InlineData(2, @"The Simpsons/02.avi")]
-        [InlineData(2, @"The Simpsons/02 - Ep Name.avi")]
-        [InlineData(2, @"The Simpsons/02-Ep Name.avi")]
-        [InlineData(2, @"The Simpsons/02.EpName.avi")]
-        [InlineData(2, @"The Simpsons/The Simpsons - 02.avi")]
-        [InlineData(2, @"The Simpsons/The Simpsons - 02 Ep Name.avi")]
-        [InlineData(7, @"GJ Club (2013)/GJ Club - 07.mkv")]
-        [InlineData(17, @"Case Closed (1996-2007)/Case Closed - 317.mkv")]
+        [InlineData(8, "The Simpsons/The Simpsons.S25E08.Steal this episode.mp4")]
+        [InlineData(2, "The Simpsons/The Simpsons - 02 - Ep Name.avi")]
+        [InlineData(2, "The Simpsons/02.avi")]
+        [InlineData(2, "The Simpsons/02 - Ep Name.avi")]
+        [InlineData(2, "The Simpsons/02-Ep Name.avi")]
+        [InlineData(2, "The Simpsons/02.EpName.avi")]
+        [InlineData(2, "The Simpsons/The Simpsons - 02.avi")]
+        [InlineData(2, "The Simpsons/The Simpsons - 02 Ep Name.avi")]
+        [InlineData(7, "GJ Club (2013)/GJ Club - 07.mkv")]
+        [InlineData(17, "Case Closed (1996-2007)/Case Closed - 317.mkv")]
         // TODO: [InlineData(2, @"The Simpsons/The Simpsons 5 - 02 - Ep Name.avi")]
         // TODO: [InlineData(2, @"The Simpsons/The Simpsons 5 - 02 Ep Name.avi")]
         // TODO: [InlineData(7, @"Seinfeld/Seinfeld 0807 The Checks.avi")]
diff --git a/tests/Jellyfin.Naming.Tests/TV/MultiEpisodeTests.cs b/tests/Jellyfin.Naming.Tests/TV/MultiEpisodeTests.cs
index ffaa64c3f..6d6591abf 100644
--- a/tests/Jellyfin.Naming.Tests/TV/MultiEpisodeTests.cs
+++ b/tests/Jellyfin.Naming.Tests/TV/MultiEpisodeTests.cs
@@ -9,66 +9,66 @@ namespace Jellyfin.Naming.Tests.TV
         private readonly EpisodePathParser _episodePathParser = new EpisodePathParser(new NamingOptions());
 
         [Theory]
-        [InlineData(@"Season 1/4x01 – 20 Hours in America (1).mkv", null)]
-        [InlineData(@"Season 1/01x02 blah.avi", null)]
-        [InlineData(@"Season 1/S01x02 blah.avi", null)]
-        [InlineData(@"Season 1/S01E02 blah.avi", null)]
-        [InlineData(@"Season 1/S01xE02 blah.avi", null)]
-        [InlineData(@"Season 1/seriesname 01x02 blah.avi", null)]
-        [InlineData(@"Season 1/seriesname S01x02 blah.avi", null)]
-        [InlineData(@"Season 1/seriesname S01E02 blah.avi", null)]
-        [InlineData(@"Season 1/seriesname S01xE02 blah.avi", null)]
-        [InlineData(@"Season 2/02x03 - 04 Ep Name.mp4", null)]
-        [InlineData(@"Season 2/My show name 02x03 - 04 Ep Name.mp4", null)]
-        [InlineData(@"Season 2/Elementary - 02x03 - 02x04 - 02x15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 2/02x03 - 02x04 - 02x15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 2/02x03-04-15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 2/Elementary - 02x03-04-15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 02/02x03-E15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 02/Elementary - 02x03-E15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 02/02x03 - x04 - x15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 02/Elementary - 02x03 - x04 - x15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 02/02x03x04x15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 02/Elementary - 02x03x04x15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 1/Elementary - S01E23-E24-E26 - The Woman.mp4", 26)]
-        [InlineData(@"Season 1/S01E23-E24-E26 - The Woman.mp4", 26)]
+        [InlineData("Season 1/4x01 – 20 Hours in America (1).mkv", null)]
+        [InlineData("Season 1/01x02 blah.avi", null)]
+        [InlineData("Season 1/S01x02 blah.avi", null)]
+        [InlineData("Season 1/S01E02 blah.avi", null)]
+        [InlineData("Season 1/S01xE02 blah.avi", null)]
+        [InlineData("Season 1/seriesname 01x02 blah.avi", null)]
+        [InlineData("Season 1/seriesname S01x02 blah.avi", null)]
+        [InlineData("Season 1/seriesname S01E02 blah.avi", null)]
+        [InlineData("Season 1/seriesname S01xE02 blah.avi", null)]
+        [InlineData("Season 2/02x03 - 04 Ep Name.mp4", null)]
+        [InlineData("Season 2/My show name 02x03 - 04 Ep Name.mp4", null)]
+        [InlineData("Season 2/Elementary - 02x03 - 02x04 - 02x15 - Ep Name.mp4", 15)]
+        [InlineData("Season 2/02x03 - 02x04 - 02x15 - Ep Name.mp4", 15)]
+        [InlineData("Season 2/02x03-04-15 - Ep Name.mp4", 15)]
+        [InlineData("Season 2/Elementary - 02x03-04-15 - Ep Name.mp4", 15)]
+        [InlineData("Season 02/02x03-E15 - Ep Name.mp4", 15)]
+        [InlineData("Season 02/Elementary - 02x03-E15 - Ep Name.mp4", 15)]
+        [InlineData("Season 02/02x03 - x04 - x15 - Ep Name.mp4", 15)]
+        [InlineData("Season 02/Elementary - 02x03 - x04 - x15 - Ep Name.mp4", 15)]
+        [InlineData("Season 02/02x03x04x15 - Ep Name.mp4", 15)]
+        [InlineData("Season 02/Elementary - 02x03x04x15 - Ep Name.mp4", 15)]
+        [InlineData("Season 1/Elementary - S01E23-E24-E26 - The Woman.mp4", 26)]
+        [InlineData("Season 1/S01E23-E24-E26 - The Woman.mp4", 26)]
         // Four Digits seasons
-        [InlineData(@"Season 2009/2009x02 blah.avi", null)]
-        [InlineData(@"Season 2009/S2009x02 blah.avi", null)]
-        [InlineData(@"Season 2009/S2009E02 blah.avi", null)]
-        [InlineData(@"Season 2009/S2009xE02 blah.avi", null)]
-        [InlineData(@"Season 2009/seriesname 2009x02 blah.avi", null)]
-        [InlineData(@"Season 2009/seriesname S2009x02 blah.avi", null)]
-        [InlineData(@"Season 2009/seriesname S2009E02 blah.avi", null)]
-        [InlineData(@"Season 2009/seriesname S2009xE02 blah.avi", null)]
-        [InlineData(@"Season 2009/Elementary - 2009x03 - 2009x04 - 2009x15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 2009/2009x03 - 2009x04 - 2009x15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 2009/2009x03-04-15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 2009/Elementary - 2009x03-04-15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 2009/2009x03-E15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 2009/Elementary - 2009x03-E15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 2009/2009x03 - x04 - x15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 2009/Elementary - 2009x03 - x04 - x15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 2009/2009x03x04x15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 2009/Elementary - 2009x03x04x15 - Ep Name.mp4", 15)]
-        [InlineData(@"Season 2009/Elementary - S2009E23-E24-E26 - The Woman.mp4", 26)]
-        [InlineData(@"Season 2009/S2009E23-E24-E26 - The Woman.mp4", 26)]
+        [InlineData("Season 2009/2009x02 blah.avi", null)]
+        [InlineData("Season 2009/S2009x02 blah.avi", null)]
+        [InlineData("Season 2009/S2009E02 blah.avi", null)]
+        [InlineData("Season 2009/S2009xE02 blah.avi", null)]
+        [InlineData("Season 2009/seriesname 2009x02 blah.avi", null)]
+        [InlineData("Season 2009/seriesname S2009x02 blah.avi", null)]
+        [InlineData("Season 2009/seriesname S2009E02 blah.avi", null)]
+        [InlineData("Season 2009/seriesname S2009xE02 blah.avi", null)]
+        [InlineData("Season 2009/Elementary - 2009x03 - 2009x04 - 2009x15 - Ep Name.mp4", 15)]
+        [InlineData("Season 2009/2009x03 - 2009x04 - 2009x15 - Ep Name.mp4", 15)]
+        [InlineData("Season 2009/2009x03-04-15 - Ep Name.mp4", 15)]
+        [InlineData("Season 2009/Elementary - 2009x03-04-15 - Ep Name.mp4", 15)]
+        [InlineData("Season 2009/2009x03-E15 - Ep Name.mp4", 15)]
+        [InlineData("Season 2009/Elementary - 2009x03-E15 - Ep Name.mp4", 15)]
+        [InlineData("Season 2009/2009x03 - x04 - x15 - Ep Name.mp4", 15)]
+        [InlineData("Season 2009/Elementary - 2009x03 - x04 - x15 - Ep Name.mp4", 15)]
+        [InlineData("Season 2009/2009x03x04x15 - Ep Name.mp4", 15)]
+        [InlineData("Season 2009/Elementary - 2009x03x04x15 - Ep Name.mp4", 15)]
+        [InlineData("Season 2009/Elementary - S2009E23-E24-E26 - The Woman.mp4", 26)]
+        [InlineData("Season 2009/S2009E23-E24-E26 - The Woman.mp4", 26)]
         // Without season number
-        [InlineData(@"Season 1/02 - blah.avi", null)]
-        [InlineData(@"Season 2/02 - blah 14 blah.avi", null)]
-        [InlineData(@"Season 1/02 - blah-02 a.avi", null)]
-        [InlineData(@"Season 2/02.avi", null)]
-        [InlineData(@"Season 1/02-03 - blah.avi", 3)]
-        [InlineData(@"Season 2/02-04 - blah 14 blah.avi", 4)]
-        [InlineData(@"Season 1/02-05 - blah-02 a.avi", 5)]
-        [InlineData(@"Season 2/02-04.avi", 4)]
-        [InlineData(@"Season 2 /[HorribleSubs] Hunter X Hunter - 136[720p].mkv", null)]
+        [InlineData("Season 1/02 - blah.avi", null)]
+        [InlineData("Season 2/02 - blah 14 blah.avi", null)]
+        [InlineData("Season 1/02 - blah-02 a.avi", null)]
+        [InlineData("Season 2/02.avi", null)]
+        [InlineData("Season 1/02-03 - blah.avi", 3)]
+        [InlineData("Season 2/02-04 - blah 14 blah.avi", 4)]
+        [InlineData("Season 1/02-05 - blah-02 a.avi", 5)]
+        [InlineData("Season 2/02-04.avi", 4)]
+        [InlineData("Season 2 /[HorribleSubs] Hunter X Hunter - 136[720p].mkv", null)]
         // With format specification that must not be detected as ending episode number
-        [InlineData(@"Season 1/series-s09e14-1080p.mkv", null)]
-        [InlineData(@"Season 1/series-s09e14-720p.mkv", null)]
-        [InlineData(@"Season 1/series-s09e14-720i.mkv", null)]
-        [InlineData(@"Season 1/MOONLIGHTING_s01e01-e04.mkv", 4)]
-        [InlineData(@"Season 1/MOONLIGHTING_s01e01-e04", 4)]
+        [InlineData("Season 1/series-s09e14-1080p.mkv", null)]
+        [InlineData("Season 1/series-s09e14-720p.mkv", null)]
+        [InlineData("Season 1/series-s09e14-720i.mkv", null)]
+        [InlineData("Season 1/MOONLIGHTING_s01e01-e04.mkv", 4)]
+        [InlineData("Season 1/MOONLIGHTING_s01e01-e04", 4)]
         public void TestGetEndingEpisodeNumberFromFile(string filename, int? endingEpisodeNumber)
         {
             var result = _episodePathParser.Parse(filename, false);
diff --git a/tests/Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs b/tests/Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs
index 55af33836..6773bbeb1 100644
--- a/tests/Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs
+++ b/tests/Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs
@@ -6,23 +6,23 @@ namespace Jellyfin.Naming.Tests.TV
     public class SeasonFolderTests
     {
         [Theory]
-        [InlineData(@"/Drive/Season 1", 1, true)]
-        [InlineData(@"/Drive/Season 2", 2, true)]
-        [InlineData(@"/Drive/Season 02", 2, true)]
-        [InlineData(@"/Drive/Seinfeld/S02", 2, true)]
-        [InlineData(@"/Drive/Seinfeld/2", 2, true)]
-        [InlineData(@"/Drive/Season 2009", 2009, true)]
-        [InlineData(@"/Drive/Season1", 1, true)]
-        [InlineData(@"The Wonder Years/The.Wonder.Years.S04.PDTV.x264-JCH", 4, true)]
-        [InlineData(@"/Drive/Season 7 (2016)", 7, false)]
-        [InlineData(@"/Drive/Staffel 7 (2016)", 7, false)]
-        [InlineData(@"/Drive/Stagione 7 (2016)", 7, false)]
-        [InlineData(@"/Drive/Season (8)", null, false)]
-        [InlineData(@"/Drive/3.Staffel", 3, false)]
-        [InlineData(@"/Drive/s06e05", null, false)]
-        [InlineData(@"/Drive/The.Legend.of.Condor.Heroes.2017.V2.web-dl.1080p.h264.aac-hdctv", null, false)]
-        [InlineData(@"/Drive/extras", 0, true)]
-        [InlineData(@"/Drive/specials", 0, true)]
+        [InlineData("/Drive/Season 1", 1, true)]
+        [InlineData("/Drive/Season 2", 2, true)]
+        [InlineData("/Drive/Season 02", 2, true)]
+        [InlineData("/Drive/Seinfeld/S02", 2, true)]
+        [InlineData("/Drive/Seinfeld/2", 2, true)]
+        [InlineData("/Drive/Season 2009", 2009, true)]
+        [InlineData("/Drive/Season1", 1, true)]
+        [InlineData("The Wonder Years/The.Wonder.Years.S04.PDTV.x264-JCH", 4, true)]
+        [InlineData("/Drive/Season 7 (2016)", 7, false)]
+        [InlineData("/Drive/Staffel 7 (2016)", 7, false)]
+        [InlineData("/Drive/Stagione 7 (2016)", 7, false)]
+        [InlineData("/Drive/Season (8)", null, false)]
+        [InlineData("/Drive/3.Staffel", 3, false)]
+        [InlineData("/Drive/s06e05", null, false)]
+        [InlineData("/Drive/The.Legend.of.Condor.Heroes.2017.V2.web-dl.1080p.h264.aac-hdctv", null, false)]
+        [InlineData("/Drive/extras", 0, true)]
+        [InlineData("/Drive/specials", 0, true)]
         public void GetSeasonNumberFromPathTest(string path, int? seasonNumber, bool isSeasonDirectory)
         {
             var result = SeasonPathParser.Parse(path, true, true);
diff --git a/tests/Jellyfin.Naming.Tests/TV/SeasonNumberTests.cs b/tests/Jellyfin.Naming.Tests/TV/SeasonNumberTests.cs
index 58ec1b5d2..94a953de3 100644
--- a/tests/Jellyfin.Naming.Tests/TV/SeasonNumberTests.cs
+++ b/tests/Jellyfin.Naming.Tests/TV/SeasonNumberTests.cs
@@ -51,8 +51,8 @@ namespace Jellyfin.Naming.Tests.TV
         [InlineData("Season 2009/Elementary - S2009E23-E24-E26 - The Woman.mp4", 2009)]
         [InlineData("Season 2009/S2009E23-E24-E26 - The Woman.mp4", 2009)]
         [InlineData("Series/1-12 - The Woman.mp4", 1)]
-        [InlineData(@"Running Man/Running Man S2017E368.mkv", 2017)]
-        [InlineData(@"Case Closed (1996-2007)/Case Closed - 317.mkv", 3)]
+        [InlineData("Running Man/Running Man S2017E368.mkv", 2017)]
+        [InlineData("Case Closed (1996-2007)/Case Closed - 317.mkv", 3)]
         // TODO: [InlineData(@"Seinfeld/Seinfeld 0807 The Checks.avi", 8)]
         public void GetSeasonNumberFromEpisodeFileTest(string path, int? expected)
         {
diff --git a/tests/Jellyfin.Naming.Tests/TV/SimpleEpisodeTests.cs b/tests/Jellyfin.Naming.Tests/TV/SimpleEpisodeTests.cs
index fa46ecc3a..3721cd28c 100644
--- a/tests/Jellyfin.Naming.Tests/TV/SimpleEpisodeTests.cs
+++ b/tests/Jellyfin.Naming.Tests/TV/SimpleEpisodeTests.cs
@@ -21,8 +21,8 @@ namespace Jellyfin.Naming.Tests.TV
         [InlineData("Series/4x12 - The Woman.mp4", "", 4, 12)]
         [InlineData("Series/LA X, Pt. 1_s06e32.mp4", "LA X, Pt. 1", 6, 32)]
         [InlineData("[Baz-Bar]Foo - [1080p][Multiple Subtitle]/[Baz-Bar] Foo - 05 [1080p][Multiple Subtitle].mkv", "Foo", null, 5)]
-        [InlineData(@"/Foo/The.Series.Name.S01E04.WEBRip.x264-Baz[Bar]/the.series.name.s01e04.webrip.x264-Baz[Bar].mkv", "The.Series.Name", 1, 4)]
-        [InlineData(@"Love.Death.and.Robots.S01.1080p.NF.WEB-DL.DDP5.1.x264-NTG/Love.Death.and.Robots.S01E01.Sonnies.Edge.1080p.NF.WEB-DL.DDP5.1.x264-NTG.mkv", "Love.Death.and.Robots", 1, 1)]
+        [InlineData("/Foo/The.Series.Name.S01E04.WEBRip.x264-Baz[Bar]/the.series.name.s01e04.webrip.x264-Baz[Bar].mkv", "The.Series.Name", 1, 4)]
+        [InlineData("Love.Death.and.Robots.S01.1080p.NF.WEB-DL.DDP5.1.x264-NTG/Love.Death.and.Robots.S01E01.Sonnies.Edge.1080p.NF.WEB-DL.DDP5.1.x264-NTG.mkv", "Love.Death.and.Robots", 1, 1)]
         [InlineData("[YuiSubs] Tensura Nikki - Tensei Shitara Slime Datta Ken/[YuiSubs] Tensura Nikki - Tensei Shitara Slime Datta Ken - 12 (NVENC H.265 1080p).mkv", "Tensura Nikki - Tensei Shitara Slime Datta Ken", null, 12)]
         [InlineData("[Baz-Bar]Foo - 01 - 12[1080p][Multiple Subtitle]/[Baz-Bar] Foo - 05 [1080p][Multiple Subtitle].mkv", "Foo", null, 5)]
         [InlineData("Series/4-12 - The Woman.mp4", "", 4, 12, 12)]
diff --git a/tests/Jellyfin.Naming.Tests/Video/CleanDateTimeTests.cs b/tests/Jellyfin.Naming.Tests/Video/CleanDateTimeTests.cs
index b1141df47..62d60e5a4 100644
--- a/tests/Jellyfin.Naming.Tests/Video/CleanDateTimeTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/CleanDateTimeTests.cs
@@ -10,34 +10,34 @@ namespace Jellyfin.Naming.Tests.Video
         private readonly NamingOptions _namingOptions = new NamingOptions();
 
         [Theory]
-        [InlineData(@"The Wolf of Wall Street (2013).mkv", "The Wolf of Wall Street", 2013)]
-        [InlineData(@"The Wolf of Wall Street 2 (2013).mkv", "The Wolf of Wall Street 2", 2013)]
-        [InlineData(@"The Wolf of Wall Street - 2 (2013).mkv", "The Wolf of Wall Street - 2", 2013)]
-        [InlineData(@"The Wolf of Wall Street 2001 (2013).mkv", "The Wolf of Wall Street 2001", 2013)]
-        [InlineData(@"300 (2006).mkv", "300", 2006)]
-        [InlineData(@"d:/movies/300 (2006).mkv", "300", 2006)]
-        [InlineData(@"300 2 (2006).mkv", "300 2", 2006)]
-        [InlineData(@"300 - 2 (2006).mkv", "300 - 2", 2006)]
-        [InlineData(@"300 2001 (2006).mkv", "300 2001", 2006)]
-        [InlineData(@"curse.of.chucky.2013.stv.unrated.multi.1080p.bluray.x264-rough", "curse.of.chucky", 2013)]
-        [InlineData(@"curse.of.chucky.2013.stv.unrated.multi.2160p.bluray.x264-rough", "curse.of.chucky", 2013)]
-        [InlineData(@"/server/Movies/300 (2007)/300 (2006).bluray.disc", "300", 2006)]
-        [InlineData(@"Arrival.2016.2160p.Blu-Ray.HEVC.mkv", "Arrival", 2016)]
-        [InlineData(@"The Wolf of Wall Street (2013)", "The Wolf of Wall Street", 2013)]
-        [InlineData(@"The Wolf of Wall Street 2 (2013)", "The Wolf of Wall Street 2", 2013)]
-        [InlineData(@"The Wolf of Wall Street - 2 (2013)", "The Wolf of Wall Street - 2", 2013)]
-        [InlineData(@"The Wolf of Wall Street 2001 (2013)", "The Wolf of Wall Street 2001", 2013)]
-        [InlineData(@"300 (2006)", "300", 2006)]
-        [InlineData(@"d:/movies/300 (2006)", "300", 2006)]
-        [InlineData(@"300 2 (2006)", "300 2", 2006)]
-        [InlineData(@"300 - 2 (2006)", "300 - 2", 2006)]
-        [InlineData(@"300 2001 (2006)", "300 2001", 2006)]
-        [InlineData(@"/server/Movies/300 (2007)/300 (2006)", "300", 2006)]
-        [InlineData(@"/server/Movies/300 (2007)/300 (2006).mkv", "300", 2006)]
-        [InlineData(@"American.Psycho.mkv", "American.Psycho.mkv", null)]
-        [InlineData(@"American Psycho.mkv", "American Psycho.mkv", null)]
-        [InlineData(@"[rec].mkv", "[rec].mkv", null)]
-        [InlineData(@"St. Vincent (2014)", "St. Vincent", 2014)]
+        [InlineData("The Wolf of Wall Street (2013).mkv", "The Wolf of Wall Street", 2013)]
+        [InlineData("The Wolf of Wall Street 2 (2013).mkv", "The Wolf of Wall Street 2", 2013)]
+        [InlineData("The Wolf of Wall Street - 2 (2013).mkv", "The Wolf of Wall Street - 2", 2013)]
+        [InlineData("The Wolf of Wall Street 2001 (2013).mkv", "The Wolf of Wall Street 2001", 2013)]
+        [InlineData("300 (2006).mkv", "300", 2006)]
+        [InlineData("d:/movies/300 (2006).mkv", "300", 2006)]
+        [InlineData("300 2 (2006).mkv", "300 2", 2006)]
+        [InlineData("300 - 2 (2006).mkv", "300 - 2", 2006)]
+        [InlineData("300 2001 (2006).mkv", "300 2001", 2006)]
+        [InlineData("curse.of.chucky.2013.stv.unrated.multi.1080p.bluray.x264-rough", "curse.of.chucky", 2013)]
+        [InlineData("curse.of.chucky.2013.stv.unrated.multi.2160p.bluray.x264-rough", "curse.of.chucky", 2013)]
+        [InlineData("/server/Movies/300 (2007)/300 (2006).bluray.disc", "300", 2006)]
+        [InlineData("Arrival.2016.2160p.Blu-Ray.HEVC.mkv", "Arrival", 2016)]
+        [InlineData("The Wolf of Wall Street (2013)", "The Wolf of Wall Street", 2013)]
+        [InlineData("The Wolf of Wall Street 2 (2013)", "The Wolf of Wall Street 2", 2013)]
+        [InlineData("The Wolf of Wall Street - 2 (2013)", "The Wolf of Wall Street - 2", 2013)]
+        [InlineData("The Wolf of Wall Street 2001 (2013)", "The Wolf of Wall Street 2001", 2013)]
+        [InlineData("300 (2006)", "300", 2006)]
+        [InlineData("d:/movies/300 (2006)", "300", 2006)]
+        [InlineData("300 2 (2006)", "300 2", 2006)]
+        [InlineData("300 - 2 (2006)", "300 - 2", 2006)]
+        [InlineData("300 2001 (2006)", "300 2001", 2006)]
+        [InlineData("/server/Movies/300 (2007)/300 (2006)", "300", 2006)]
+        [InlineData("/server/Movies/300 (2007)/300 (2006).mkv", "300", 2006)]
+        [InlineData("American.Psycho.mkv", "American.Psycho.mkv", null)]
+        [InlineData("American Psycho.mkv", "American Psycho.mkv", null)]
+        [InlineData("[rec].mkv", "[rec].mkv", null)]
+        [InlineData("St. Vincent (2014)", "St. Vincent", 2014)]
         [InlineData("Super movie(2009).mp4", "Super movie", 2009)]
         [InlineData("Drug War 2013.mp4", "Drug War", 2013)]
         [InlineData("My Movie (1997) - GreatestReleaseGroup 2019.mp4", "My Movie", 1997)]
@@ -45,9 +45,9 @@ namespace Jellyfin.Naming.Tests.Video
         [InlineData("First Man (2018) 1080p.mkv", "First Man", 2018)]
         [InlineData("Maximum Ride - 2016 - WEBDL-1080p - x264 AC3.mkv", "Maximum Ride", 2016)]
         // FIXME: [InlineData("Robin Hood [Multi-Subs] [2018].mkv", "Robin Hood", 2018)]
-        [InlineData(@"3.Days.to.Kill.2014.720p.BluRay.x264.YIFY.mkv", "3.Days.to.Kill", 2014)] // In this test case, running CleanDateTime first produces no date, so it will attempt to run CleanString first and then CleanDateTime again
+        [InlineData("3.Days.to.Kill.2014.720p.BluRay.x264.YIFY.mkv", "3.Days.to.Kill", 2014)] // In this test case, running CleanDateTime first produces no date, so it will attempt to run CleanString first and then CleanDateTime again
         [InlineData("3 days to kill (2005).mkv", "3 days to kill", 2005)]
-        [InlineData(@"Rain Man 1988 REMASTERED 1080p BluRay x264 AAC - Ozlem.mp4", "Rain Man", 1988)]
+        [InlineData("Rain Man 1988 REMASTERED 1080p BluRay x264 AAC - Ozlem.mp4", "Rain Man", 1988)]
         [InlineData("My Movie 2013.12.09", "My Movie 2013.12.09", null)]
         [InlineData("My Movie 2013-12-09", "My Movie 2013-12-09", null)]
         [InlineData("My Movie 20131209", "My Movie 20131209", null)]
diff --git a/tests/Jellyfin.Naming.Tests/Video/Format3DTests.cs b/tests/Jellyfin.Naming.Tests/Video/Format3DTests.cs
index 511a014a6..fccce5bff 100644
--- a/tests/Jellyfin.Naming.Tests/Video/Format3DTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/Format3DTests.cs
@@ -22,7 +22,7 @@ namespace Jellyfin.Naming.Tests.Video
         [Fact]
         public void Test3DName()
         {
-            var result = VideoResolver.ResolveFile(@"C:/Users/media/Desktop/Video Test/Movies/Oblivion/Oblivion.3d.hsbs.mkv", _namingOptions);
+            var result = VideoResolver.ResolveFile("C:/Users/media/Desktop/Video Test/Movies/Oblivion/Oblivion.3d.hsbs.mkv", _namingOptions);
 
             Assert.Equal("hsbs", result?.Format3D);
             Assert.Equal("Oblivion", result?.Name);
diff --git a/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs b/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs
index 294f11ee7..183ec8984 100644
--- a/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs
@@ -15,10 +15,10 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past - 1080p.mkv",
-                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past-trailer.mp4",
-                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past - [hsbs].mkv",
-                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past [hsbs].mkv"
+                "/movies/X-Men Days of Future Past/X-Men Days of Future Past - 1080p.mkv",
+                "/movies/X-Men Days of Future Past/X-Men Days of Future Past-trailer.mp4",
+                "/movies/X-Men Days of Future Past/X-Men Days of Future Past - [hsbs].mkv",
+                "/movies/X-Men Days of Future Past/X-Men Days of Future Past [hsbs].mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -34,10 +34,10 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past - apple.mkv",
-                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past-trailer.mp4",
-                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past - banana.mkv",
-                @"/movies/X-Men Days of Future Past/X-Men Days of Future Past [banana].mp4"
+                "/movies/X-Men Days of Future Past/X-Men Days of Future Past - apple.mkv",
+                "/movies/X-Men Days of Future Past/X-Men Days of Future Past-trailer.mp4",
+                "/movies/X-Men Days of Future Past/X-Men Days of Future Past - banana.mkv",
+                "/movies/X-Men Days of Future Past/X-Men Days of Future Past [banana].mp4"
             };
 
             var result = VideoListResolver.Resolve(
@@ -54,8 +54,8 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/The Phantom of the Opera (1925)/The Phantom of the Opera (1925) - 1925 version.mkv",
-                @"/movies/The Phantom of the Opera (1925)/The Phantom of the Opera (1925) - 1929 version.mkv"
+                "/movies/The Phantom of the Opera (1925)/The Phantom of the Opera (1925) - 1925 version.mkv",
+                "/movies/The Phantom of the Opera (1925)/The Phantom of the Opera (1925) - 1929 version.mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -71,13 +71,13 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/M/Movie 1.mkv",
-                @"/movies/M/Movie 2.mkv",
-                @"/movies/M/Movie 3.mkv",
-                @"/movies/M/Movie 4.mkv",
-                @"/movies/M/Movie 5.mkv",
-                @"/movies/M/Movie 6.mkv",
-                @"/movies/M/Movie 7.mkv"
+                "/movies/M/Movie 1.mkv",
+                "/movies/M/Movie 2.mkv",
+                "/movies/M/Movie 3.mkv",
+                "/movies/M/Movie 4.mkv",
+                "/movies/M/Movie 5.mkv",
+                "/movies/M/Movie 6.mkv",
+                "/movies/M/Movie 7.mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -93,14 +93,14 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/Movie/Movie.mkv",
-                @"/movies/Movie/Movie-2.mkv",
-                @"/movies/Movie/Movie-3.mkv",
-                @"/movies/Movie/Movie-4.mkv",
-                @"/movies/Movie/Movie-5.mkv",
-                @"/movies/Movie/Movie-6.mkv",
-                @"/movies/Movie/Movie-7.mkv",
-                @"/movies/Movie/Movie-8.mkv"
+                "/movies/Movie/Movie.mkv",
+                "/movies/Movie/Movie-2.mkv",
+                "/movies/Movie/Movie-3.mkv",
+                "/movies/Movie/Movie-4.mkv",
+                "/movies/Movie/Movie-5.mkv",
+                "/movies/Movie/Movie-6.mkv",
+                "/movies/Movie/Movie-7.mkv",
+                "/movies/Movie/Movie-8.mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -116,15 +116,15 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/Mo/Movie 1.mkv",
-                @"/movies/Mo/Movie 2.mkv",
-                @"/movies/Mo/Movie 3.mkv",
-                @"/movies/Mo/Movie 4.mkv",
-                @"/movies/Mo/Movie 5.mkv",
-                @"/movies/Mo/Movie 6.mkv",
-                @"/movies/Mo/Movie 7.mkv",
-                @"/movies/Mo/Movie 8.mkv",
-                @"/movies/Mo/Movie 9.mkv"
+                "/movies/Mo/Movie 1.mkv",
+                "/movies/Mo/Movie 2.mkv",
+                "/movies/Mo/Movie 3.mkv",
+                "/movies/Mo/Movie 4.mkv",
+                "/movies/Mo/Movie 5.mkv",
+                "/movies/Mo/Movie 6.mkv",
+                "/movies/Mo/Movie 7.mkv",
+                "/movies/Mo/Movie 8.mkv",
+                "/movies/Mo/Movie 9.mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -140,11 +140,11 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/Movie/Movie 1.mkv",
-                @"/movies/Movie/Movie 2.mkv",
-                @"/movies/Movie/Movie 3.mkv",
-                @"/movies/Movie/Movie 4.mkv",
-                @"/movies/Movie/Movie 5.mkv"
+                "/movies/Movie/Movie 1.mkv",
+                "/movies/Movie/Movie 2.mkv",
+                "/movies/Movie/Movie 3.mkv",
+                "/movies/Movie/Movie 4.mkv",
+                "/movies/Movie/Movie 5.mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -162,11 +162,11 @@ namespace Jellyfin.Naming.Tests.Video
 
             var files = new[]
             {
-                @"/movies/Iron Man/Iron Man.mkv",
-                @"/movies/Iron Man/Iron Man (2008).mkv",
-                @"/movies/Iron Man/Iron Man (2009).mkv",
-                @"/movies/Iron Man/Iron Man (2010).mkv",
-                @"/movies/Iron Man/Iron Man (2011).mkv"
+                "/movies/Iron Man/Iron Man.mkv",
+                "/movies/Iron Man/Iron Man (2008).mkv",
+                "/movies/Iron Man/Iron Man (2009).mkv",
+                "/movies/Iron Man/Iron Man (2010).mkv",
+                "/movies/Iron Man/Iron Man (2011).mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -182,13 +182,13 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/Iron Man/Iron Man.mkv",
-                @"/movies/Iron Man/Iron Man-720p.mkv",
-                @"/movies/Iron Man/Iron Man-test.mkv",
-                @"/movies/Iron Man/Iron Man-bluray.mkv",
-                @"/movies/Iron Man/Iron Man-3d.mkv",
-                @"/movies/Iron Man/Iron Man-3d-hsbs.mkv",
-                @"/movies/Iron Man/Iron Man[test].mkv"
+                "/movies/Iron Man/Iron Man.mkv",
+                "/movies/Iron Man/Iron Man-720p.mkv",
+                "/movies/Iron Man/Iron Man-test.mkv",
+                "/movies/Iron Man/Iron Man-bluray.mkv",
+                "/movies/Iron Man/Iron Man-3d.mkv",
+                "/movies/Iron Man/Iron Man-3d-hsbs.mkv",
+                "/movies/Iron Man/Iron Man[test].mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -211,13 +211,13 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/Iron Man/Iron Man.mkv",
-                @"/movies/Iron Man/Iron Man - 720p.mkv",
-                @"/movies/Iron Man/Iron Man - test.mkv",
-                @"/movies/Iron Man/Iron Man - bluray.mkv",
-                @"/movies/Iron Man/Iron Man - 3d.mkv",
-                @"/movies/Iron Man/Iron Man - 3d-hsbs.mkv",
-                @"/movies/Iron Man/Iron Man [test].mkv"
+                "/movies/Iron Man/Iron Man.mkv",
+                "/movies/Iron Man/Iron Man - 720p.mkv",
+                "/movies/Iron Man/Iron Man - test.mkv",
+                "/movies/Iron Man/Iron Man - bluray.mkv",
+                "/movies/Iron Man/Iron Man - 3d.mkv",
+                "/movies/Iron Man/Iron Man - 3d-hsbs.mkv",
+                "/movies/Iron Man/Iron Man [test].mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -240,8 +240,8 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/Iron Man/Iron Man - B (2006).mkv",
-                @"/movies/Iron Man/Iron Man - C (2007).mkv"
+                "/movies/Iron Man/Iron Man - B (2006).mkv",
+                "/movies/Iron Man/Iron Man - C (2007).mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -256,13 +256,13 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/Iron Man/Iron Man.mkv",
-                @"/movies/Iron Man/Iron Man_720p.mkv",
-                @"/movies/Iron Man/Iron Man_test.mkv",
-                @"/movies/Iron Man/Iron Man_bluray.mkv",
-                @"/movies/Iron Man/Iron Man_3d.mkv",
-                @"/movies/Iron Man/Iron Man_3d-hsbs.mkv",
-                @"/movies/Iron Man/Iron Man_3d.hsbs.mkv"
+                "/movies/Iron Man/Iron Man.mkv",
+                "/movies/Iron Man/Iron Man_720p.mkv",
+                "/movies/Iron Man/Iron Man_test.mkv",
+                "/movies/Iron Man/Iron Man_bluray.mkv",
+                "/movies/Iron Man/Iron Man_3d.mkv",
+                "/movies/Iron Man/Iron Man_3d-hsbs.mkv",
+                "/movies/Iron Man/Iron Man_3d.hsbs.mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -280,11 +280,11 @@ namespace Jellyfin.Naming.Tests.Video
 
             var files = new[]
             {
-                @"/movies/Iron Man/Iron Man (2007).mkv",
-                @"/movies/Iron Man/Iron Man (2008).mkv",
-                @"/movies/Iron Man/Iron Man (2009).mkv",
-                @"/movies/Iron Man/Iron Man (2010).mkv",
-                @"/movies/Iron Man/Iron Man (2011).mkv"
+                "/movies/Iron Man/Iron Man (2007).mkv",
+                "/movies/Iron Man/Iron Man (2008).mkv",
+                "/movies/Iron Man/Iron Man (2009).mkv",
+                "/movies/Iron Man/Iron Man (2010).mkv",
+                "/movies/Iron Man/Iron Man (2011).mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -300,8 +300,8 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/Blade Runner (1982)/Blade Runner (1982) [Final Cut] [1080p HEVC AAC].mkv",
-                @"/movies/Blade Runner (1982)/Blade Runner (1982) [EE by ADM] [480p HEVC AAC,AAC,AAC].mkv"
+                "/movies/Blade Runner (1982)/Blade Runner (1982) [Final Cut] [1080p HEVC AAC].mkv",
+                "/movies/Blade Runner (1982)/Blade Runner (1982) [EE by ADM] [480p HEVC AAC,AAC,AAC].mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -317,8 +317,8 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) [1080p] Blu-ray.x264.DTS.mkv",
-                @"/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) [2160p] Blu-ray.x265.AAC.mkv"
+                "/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) [1080p] Blu-ray.x264.DTS.mkv",
+                "/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) [2160p] Blu-ray.x265.AAC.mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -334,12 +334,12 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) - Theatrical Release.mkv",
-                @"/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) - Directors Cut.mkv",
-                @"/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) - 1080p.mkv",
-                @"/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) - 2160p.mkv",
-                @"/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) - 720p.mkv",
-                @"/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016).mkv",
+                "/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) - Theatrical Release.mkv",
+                "/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) - Directors Cut.mkv",
+                "/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) - 1080p.mkv",
+                "/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) - 2160p.mkv",
+                "/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016) - 720p.mkv",
+                "/movies/X-Men Apocalypse (2016)/X-Men Apocalypse (2016).mkv",
             };
 
             var result = VideoListResolver.Resolve(
@@ -361,8 +361,8 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/John Wick - Kapitel 3 (2019) [imdbid=tt6146586]/John Wick - Kapitel 3 (2019) [imdbid=tt6146586] - Version 1.mkv",
-                @"/movies/John Wick - Kapitel 3 (2019) [imdbid=tt6146586]/John Wick - Kapitel 3 (2019) [imdbid=tt6146586] - Version 2.mkv"
+                "/movies/John Wick - Kapitel 3 (2019) [imdbid=tt6146586]/John Wick - Kapitel 3 (2019) [imdbid=tt6146586] - Version 1.mkv",
+                "/movies/John Wick - Kapitel 3 (2019) [imdbid=tt6146586]/John Wick - Kapitel 3 (2019) [imdbid=tt6146586] - Version 2.mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -378,8 +378,8 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/movies/John Wick - Chapter 3 (2019)/John Wick - Chapter 3 (2019) [Version 1].mkv",
-                @"/movies/John Wick - Chapter 3 (2019)/John Wick - Chapter 3 (2019) [Version 2.mkv"
+                "/movies/John Wick - Chapter 3 (2019)/John Wick - Chapter 3 (2019) [Version 1].mkv",
+                "/movies/John Wick - Chapter 3 (2019)/John Wick - Chapter 3 (2019) [Version 2.mkv"
             };
 
             var result = VideoListResolver.Resolve(
diff --git a/tests/Jellyfin.Naming.Tests/Video/StackTests.cs b/tests/Jellyfin.Naming.Tests/Video/StackTests.cs
index 97b52f749..c95703f53 100644
--- a/tests/Jellyfin.Naming.Tests/Video/StackTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/StackTests.cs
@@ -384,8 +384,8 @@ namespace Jellyfin.Naming.Tests.Video
             // No stacking here because there is no part/disc/etc
             var files = new[]
             {
-                @"M:/Movies (DVD)/Movies (Musical)/The Sound of Music/The Sound of Music (1965) (Disc 01)",
-                @"M:/Movies (DVD)/Movies (Musical)/The Sound of Music/The Sound of Music (1965) (Disc 02)"
+                "M:/Movies (DVD)/Movies (Musical)/The Sound of Music/The Sound of Music (1965) (Disc 01)",
+                "M:/Movies (DVD)/Movies (Musical)/The Sound of Music/The Sound of Music (1965) (Disc 02)"
             };
 
             var result = StackResolver.ResolveDirectories(files, _namingOptions).ToList();
diff --git a/tests/Jellyfin.Naming.Tests/Video/StubTests.cs b/tests/Jellyfin.Naming.Tests/Video/StubTests.cs
index 1d50df7a6..fc852ae85 100644
--- a/tests/Jellyfin.Naming.Tests/Video/StubTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/StubTests.cs
@@ -29,7 +29,7 @@ namespace Jellyfin.Naming.Tests.Video
         [Fact]
         public void TestStubName()
         {
-            var result = VideoResolver.ResolveFile(@"C:/Users/media/Desktop/Video Test/Movies/Oblivion/Oblivion.dvd.disc", _namingOptions);
+            var result = VideoResolver.ResolveFile("C:/Users/media/Desktop/Video Test/Movies/Oblivion/Oblivion.dvd.disc", _namingOptions);
 
             Assert.Equal("Oblivion", result?.Name);
         }
diff --git a/tests/Jellyfin.Naming.Tests/Video/VideoListResolverTests.cs b/tests/Jellyfin.Naming.Tests/Video/VideoListResolverTests.cs
index 0316377d4..377f82eac 100644
--- a/tests/Jellyfin.Naming.Tests/Video/VideoListResolverTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/VideoListResolverTests.cs
@@ -200,8 +200,8 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"M:/Movies (DVD)/Movies (Musical)/Sound of Music (1965)/Sound of Music Disc 1",
-                @"M:/Movies (DVD)/Movies (Musical)/Sound of Music (1965)/Sound of Music Disc 2"
+                "M:/Movies (DVD)/Movies (Musical)/Sound of Music (1965)/Sound of Music Disc 1",
+                "M:/Movies (DVD)/Movies (Musical)/Sound of Music (1965)/Sound of Music Disc 2"
             };
 
             var result = VideoListResolver.Resolve(
@@ -217,8 +217,8 @@ namespace Jellyfin.Naming.Tests.Video
             // These should be considered separate, unrelated videos
             var files = new[]
             {
-                @"My movie #1.mp4",
-                @"My movie #2.mp4"
+                "My movie #1.mp4",
+                "My movie #2.mp4"
             };
 
             var result = VideoListResolver.Resolve(
@@ -233,10 +233,10 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"No (2012) part1.mp4",
-                @"No (2012) part2.mp4",
-                @"No (2012) part1-trailer.mp4",
-                @"No (2012)-trailer.mp4"
+                "No (2012) part1.mp4",
+                "No (2012) part2.mp4",
+                "No (2012) part1-trailer.mp4",
+                "No (2012)-trailer.mp4"
             };
 
             var result = VideoListResolver.Resolve(
@@ -254,10 +254,10 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/Movies/Top Gun (1984)/movie.mp4",
-                @"/Movies/Top Gun (1984)/Top Gun (1984)-trailer.mp4",
-                @"/Movies/Top Gun (1984)/Top Gun (1984)-trailer2.mp4",
-                @"/Movies/trailer.mp4"
+                "/Movies/Top Gun (1984)/movie.mp4",
+                "/Movies/Top Gun (1984)/Top Gun (1984)-trailer.mp4",
+                "/Movies/Top Gun (1984)/Top Gun (1984)-trailer2.mp4",
+                "/Movies/trailer.mp4"
             };
 
             var result = VideoListResolver.Resolve(
@@ -276,10 +276,10 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/MCFAMILY-PC/Private3$/Heterosexual/Breast In Class 2 Counterfeit Racks (2011)/Breast In Class 2 Counterfeit Racks (2011) Disc 1 cd1.avi",
-                @"/MCFAMILY-PC/Private3$/Heterosexual/Breast In Class 2 Counterfeit Racks (2011)/Breast In Class 2 Counterfeit Racks (2011) Disc 1 cd2.avi",
-                @"/MCFAMILY-PC/Private3$/Heterosexual/Breast In Class 2 Counterfeit Racks (2011)/Breast In Class 2 Disc 2 cd1.avi",
-                @"/MCFAMILY-PC/Private3$/Heterosexual/Breast In Class 2 Counterfeit Racks (2011)/Breast In Class 2 Disc 2 cd2.avi"
+                "/MCFAMILY-PC/Private3$/Heterosexual/Breast In Class 2 Counterfeit Racks (2011)/Breast In Class 2 Counterfeit Racks (2011) Disc 1 cd1.avi",
+                "/MCFAMILY-PC/Private3$/Heterosexual/Breast In Class 2 Counterfeit Racks (2011)/Breast In Class 2 Counterfeit Racks (2011) Disc 1 cd2.avi",
+                "/MCFAMILY-PC/Private3$/Heterosexual/Breast In Class 2 Counterfeit Racks (2011)/Breast In Class 2 Disc 2 cd1.avi",
+                "/MCFAMILY-PC/Private3$/Heterosexual/Breast In Class 2 Counterfeit Racks (2011)/Breast In Class 2 Disc 2 cd2.avi"
             };
 
             var result = VideoListResolver.Resolve(
@@ -294,7 +294,7 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/nas-markrobbo78/Videos/INDEX HTPC/Movies/Watched/3 - ACTION/Argo (2012)/movie.mkv"
+                "/nas-markrobbo78/Videos/INDEX HTPC/Movies/Watched/3 - ACTION/Argo (2012)/movie.mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -309,7 +309,7 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"The Colony.mkv"
+                "The Colony.mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -324,8 +324,8 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"Four Sisters and a Wedding - A.avi",
-                @"Four Sisters and a Wedding - B.avi"
+                "Four Sisters and a Wedding - A.avi",
+                "Four Sisters and a Wedding - B.avi"
             };
 
             var result = VideoListResolver.Resolve(
@@ -342,8 +342,8 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"Four Rooms - A.avi",
-                @"Four Rooms - A.mp4"
+                "Four Rooms - A.avi",
+                "Four Rooms - A.mp4"
             };
 
             var result = VideoListResolver.Resolve(
@@ -358,8 +358,8 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/Server/Despicable Me/Despicable Me (2010).mkv",
-                @"/Server/Despicable Me/trailer.mkv"
+                "/Server/Despicable Me/Despicable Me (2010).mkv",
+                "/Server/Despicable Me/trailer.mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -376,8 +376,8 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/Server/Despicable Me/Despicable Me (2010).mkv",
-                @"/Server/Despicable Me/trailers/some title.mkv"
+                "/Server/Despicable Me/Despicable Me (2010).mkv",
+                "/Server/Despicable Me/trailers/some title.mkv"
             };
 
             var result = VideoListResolver.Resolve(
@@ -394,8 +394,8 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var files = new[]
             {
-                @"/Movies/Despicable Me/Despicable Me.mkv",
-                @"/Movies/Despicable Me/trailers/trailer.mkv"
+                "/Movies/Despicable Me/Despicable Me.mkv",
+                "/Movies/Despicable Me/trailers/trailer.mkv"
             };
 
             var result = VideoListResolver.Resolve(
diff --git a/tests/Jellyfin.Naming.Tests/Video/VideoResolverTests.cs b/tests/Jellyfin.Naming.Tests/Video/VideoResolverTests.cs
index 33a99e107..8455a56a1 100644
--- a/tests/Jellyfin.Naming.Tests/Video/VideoResolverTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/VideoResolverTests.cs
@@ -15,26 +15,26 @@ namespace Jellyfin.Naming.Tests.Video
             var data = new TheoryData<VideoFileInfo>();
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/7 Psychos.mkv/7 Psychos.mkv",
+                    path: "/server/Movies/7 Psychos.mkv/7 Psychos.mkv",
                     container: "mkv",
                     name: "7 Psychos"));
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/3 days to kill (2005)/3 days to kill (2005).mkv",
+                    path: "/server/Movies/3 days to kill (2005)/3 days to kill (2005).mkv",
                     container: "mkv",
                     name: "3 days to kill",
                     year: 2005));
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/American Psycho/American.Psycho.mkv",
+                    path: "/server/Movies/American Psycho/American.Psycho.mkv",
                     container: "mkv",
                     name: "American.Psycho"));
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/brave (2007)/brave (2006).3d.sbs.mkv",
+                    path: "/server/Movies/brave (2007)/brave (2006).3d.sbs.mkv",
                     container: "mkv",
                     name: "brave",
                     year: 2006,
@@ -43,14 +43,14 @@ namespace Jellyfin.Naming.Tests.Video
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/300 (2007)/300 (2006).3d1.sbas.mkv",
+                    path: "/server/Movies/300 (2007)/300 (2006).3d1.sbas.mkv",
                     container: "mkv",
                     name: "300",
                     year: 2006));
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/300 (2007)/300 (2006).3d.sbs.mkv",
+                    path: "/server/Movies/300 (2007)/300 (2006).3d.sbs.mkv",
                     container: "mkv",
                     name: "300",
                     year: 2006,
@@ -59,7 +59,7 @@ namespace Jellyfin.Naming.Tests.Video
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/brave (2007)/brave (2006)-trailer.bluray.disc",
+                    path: "/server/Movies/brave (2007)/brave (2006)-trailer.bluray.disc",
                     container: "disc",
                     name: "brave",
                     year: 2006,
@@ -68,7 +68,7 @@ namespace Jellyfin.Naming.Tests.Video
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/300 (2007)/300 (2006)-trailer.bluray.disc",
+                    path: "/server/Movies/300 (2007)/300 (2006)-trailer.bluray.disc",
                     container: "disc",
                     name: "300",
                     year: 2006,
@@ -77,7 +77,7 @@ namespace Jellyfin.Naming.Tests.Video
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/Brave (2007)/Brave (2006).bluray.disc",
+                    path: "/server/Movies/Brave (2007)/Brave (2006).bluray.disc",
                     container: "disc",
                     name: "Brave",
                     year: 2006,
@@ -86,7 +86,7 @@ namespace Jellyfin.Naming.Tests.Video
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/300 (2007)/300 (2006).bluray.disc",
+                    path: "/server/Movies/300 (2007)/300 (2006).bluray.disc",
                     container: "disc",
                     name: "300",
                     year: 2006,
@@ -95,7 +95,7 @@ namespace Jellyfin.Naming.Tests.Video
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/300 (2007)/300 (2006)-trailer.mkv",
+                    path: "/server/Movies/300 (2007)/300 (2006)-trailer.mkv",
                     container: "mkv",
                     name: "300",
                     year: 2006,
@@ -103,7 +103,7 @@ namespace Jellyfin.Naming.Tests.Video
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/Brave (2007)/Brave (2006)-trailer.mkv",
+                    path: "/server/Movies/Brave (2007)/Brave (2006)-trailer.mkv",
                     container: "mkv",
                     name: "Brave",
                     year: 2006,
@@ -111,28 +111,28 @@ namespace Jellyfin.Naming.Tests.Video
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/300 (2007)/300 (2006).mkv",
+                    path: "/server/Movies/300 (2007)/300 (2006).mkv",
                     container: "mkv",
                     name: "300",
                     year: 2006));
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/Bad Boys (1995)/Bad Boys (1995).mkv",
+                    path: "/server/Movies/Bad Boys (1995)/Bad Boys (1995).mkv",
                     container: "mkv",
                     name: "Bad Boys",
                     year: 1995));
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/Brave (2007)/Brave (2006).mkv",
+                    path: "/server/Movies/Brave (2007)/Brave (2006).mkv",
                     container: "mkv",
                     name: "Brave",
                     year: 2006));
 
             data.Add(
                 new VideoFileInfo(
-                    path: @"/server/Movies/Rain Man 1988 REMASTERED 1080p BluRay x264 AAC - JEFF/Rain Man 1988 REMASTERED 1080p BluRay x264 AAC - JEFF.mp4",
+                    path: "/server/Movies/Rain Man 1988 REMASTERED 1080p BluRay x264 AAC - JEFF/Rain Man 1988 REMASTERED 1080p BluRay x264 AAC - JEFF.mp4",
                     container: "mp4",
                     name: "Rain Man",
                     year: 1988));
@@ -174,8 +174,8 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var paths = new[]
             {
-                @"/Server/Iron Man",
-                @"Batman",
+                "/Server/Iron Man",
+                "Batman",
                 string.Empty
             };
 
diff --git a/tests/Jellyfin.Providers.Tests/Manager/ItemImageProviderTests.cs b/tests/Jellyfin.Providers.Tests/Manager/ItemImageProviderTests.cs
index f157f01e5..d5ab6ab4b 100644
--- a/tests/Jellyfin.Providers.Tests/Manager/ItemImageProviderTests.cs
+++ b/tests/Jellyfin.Providers.Tests/Manager/ItemImageProviderTests.cs
@@ -352,11 +352,11 @@ namespace Jellyfin.Providers.Tests.Manager
             {
                 if (forceRefresh)
                 {
-                    Assert.Matches(@"image url [0-9]", image.Path);
+                    Assert.Matches("image url [0-9]", image.Path);
                 }
                 else
                 {
-                    Assert.DoesNotMatch(@"image url [0-9]", image.Path);
+                    Assert.DoesNotMatch("image url [0-9]", image.Path);
                 }
             }
         }
diff --git a/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs b/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs
index 6ee4b8ef2..2b3867512 100644
--- a/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs
+++ b/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs
@@ -29,7 +29,7 @@ public class MediaInfoResolverTests
     public const string VideoDirectoryPath = "Test Data/Video";
     public const string VideoDirectoryRegex = @"Test Data[/\\]Video";
     public const string MetadataDirectoryPath = "library/00/00000000000000000000000000000000";
-    public const string MetadataDirectoryRegex = @"library.*";
+    public const string MetadataDirectoryRegex = "library.*";
 
     private readonly ILocalizationManager _localizationManager;
     private readonly MediaInfoResolver _subtitleResolver;
@@ -49,7 +49,7 @@ public class MediaInfoResolverTests
         var englishCultureDto = new CultureDto("English", "English", "en", new[] { "eng" });
 
         var localizationManager = new Mock<ILocalizationManager>(MockBehavior.Loose);
-        localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex(@"en.*", RegexOptions.IgnoreCase)))
+        localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex("en.*", RegexOptions.IgnoreCase)))
             .Returns(englishCultureDto);
         _localizationManager = localizationManager.Object;
 
@@ -79,7 +79,7 @@ public class MediaInfoResolverTests
     {
         // need a media source manager capable of returning something other than file protocol
         var mediaSourceManager = new Mock<IMediaSourceManager>();
-        mediaSourceManager.Setup(m => m.GetPathProtocol(It.IsRegex(@"http.*")))
+        mediaSourceManager.Setup(m => m.GetPathProtocol(It.IsRegex("http.*")))
             .Returns(MediaProtocol.Http);
         BaseItem.MediaSourceManager = mediaSourceManager.Object;
 
@@ -186,7 +186,7 @@ public class MediaInfoResolverTests
     {
         // need a media source manager capable of returning something other than file protocol
         var mediaSourceManager = new Mock<IMediaSourceManager>();
-        mediaSourceManager.Setup(m => m.GetPathProtocol(It.IsRegex(@"http.*")))
+        mediaSourceManager.Setup(m => m.GetPathProtocol(It.IsRegex("http.*")))
             .Returns(MediaProtocol.Http);
         BaseItem.MediaSourceManager = mediaSourceManager.Object;
 
-- 
cgit v1.2.3


From 8ea812b65d5287dad9c599d03dba8ad2994b244a Mon Sep 17 00:00:00 2001
From: Stepan Goremykin <goremukin@gmail.com>
Date: Sun, 8 Oct 2023 00:26:12 +0200
Subject: Reduce string literal length by using verbatim string

---
 Emby.Naming/Common/NamingOptions.cs                |  2 +-
 .../IO/ManagedFileSystem.cs                        |  2 +-
 .../Library/Resolvers/TV/SeasonResolver.cs         |  2 +-
 .../Users/UserManager.cs                           |  2 +-
 .../MediaEncoding/EncodingHelper.cs                | 14 ++++++-------
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 10 ++++-----
 .../MediaInfo/AudioFileProber.cs                   |  2 +-
 .../TV/EpisodePathParserTest.cs                    |  8 ++++----
 .../Library/PathExtensionsTests.cs                 | 24 +++++++++++-----------
 .../Plugins/PluginManagerTests.cs                  |  4 ++--
 .../Parsers/MovieNfoParserTests.cs                 |  2 +-
 11 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/Emby.Naming/Common/NamingOptions.cs b/Emby.Naming/Common/NamingOptions.cs
index 692edae4a..b63c8f10e 100644
--- a/Emby.Naming/Common/NamingOptions.cs
+++ b/Emby.Naming/Common/NamingOptions.cs
@@ -376,7 +376,7 @@ namespace Emby.Naming.Common
                     IsNamed = true,
                     SupportsAbsoluteEpisodeNumbers = false
                 },
-                new EpisodeExpression("[\\/._ -]p(?:ar)?t[_. -]()([ivx]+|[0-9]+)([._ -][^\\/]*)$")
+                new EpisodeExpression(@"[\/._ -]p(?:ar)?t[_. -]()([ivx]+|[0-9]+)([._ -][^\/]*)$")
                 {
                     SupportsAbsoluteEpisodeNumbers = true
                 },
diff --git a/Emby.Server.Implementations/IO/ManagedFileSystem.cs b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
index 18b00ce0b..79eca4022 100644
--- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
@@ -91,7 +91,7 @@ namespace Emby.Server.Implementations.IO
             }
 
             // unc path
-            if (filePath.StartsWith("\\\\", StringComparison.Ordinal))
+            if (filePath.StartsWith(@"\\", StringComparison.Ordinal))
             {
                 return filePath;
             }
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
index e9538a5c9..858c5b281 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
@@ -62,7 +62,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                     var resolver = new Naming.TV.EpisodeResolver(namingOptions);
 
                     var folderName = System.IO.Path.GetFileName(path);
-                    var testPath = "\\\\test\\" + folderName;
+                    var testPath = @"\\test\" + folderName;
 
                     var episodeInfo = resolver.Resolve(testPath, true);
 
diff --git a/Jellyfin.Server.Implementations/Users/UserManager.cs b/Jellyfin.Server.Implementations/Users/UserManager.cs
index 94ac4798c..22bfd7e6f 100644
--- a/Jellyfin.Server.Implementations/Users/UserManager.cs
+++ b/Jellyfin.Server.Implementations/Users/UserManager.cs
@@ -103,7 +103,7 @@ namespace Jellyfin.Server.Implementations.Users
         // This is some regex that matches only on unicode "word" characters, as well as -, _ and @
         // In theory this will cut out most if not all 'control' characters which should help minimize any weirdness
         // Usernames can contain letters (a-z + whatever else unicode is cool with), numbers (0-9), at-signs (@), dashes (-), underscores (_), apostrophes ('), periods (.) and spaces ( )
-        [GeneratedRegex("^[\\w\\ \\-'._@]+$")]
+        [GeneratedRegex(@"^[\w\ \-'._@]+$")]
         private static partial Regex ValidUsernameRegex();
 
         /// <inheritdoc/>
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 14417a5e4..03c778c07 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2947,7 +2947,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 return string.Format(
                     CultureInfo.InvariantCulture,
-                    "scale=trunc(min(max(iw\\,ih*a)\\,min({0}\\,{1}*a))/{2})*{2}:trunc(min(max(iw/a\\,ih)\\,min({0}/a\\,{1}))/2)*2",
+                    @"scale=trunc(min(max(iw\,ih*a)\,min({0}\,{1}*a))/{2})*{2}:trunc(min(max(iw/a\,ih)\,min({0}/a\,{1}))/2)*2",
                     maxWidthParam,
                     maxHeightParam,
                     scaleVal);
@@ -2989,7 +2989,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 return string.Format(
                     CultureInfo.InvariantCulture,
-                    "scale=trunc(min(max(iw\\,ih*a)\\,{0})/{1})*{1}:trunc(ow/a/2)*2",
+                    @"scale=trunc(min(max(iw\,ih*a)\,{0})/{1})*{1}:trunc(ow/a/2)*2",
                     maxWidthParam,
                     scaleVal);
             }
@@ -3001,7 +3001,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 return string.Format(
                     CultureInfo.InvariantCulture,
-                    "scale=trunc(oh*a/{1})*{1}:min(max(iw/a\\,ih)\\,{0})",
+                    @"scale=trunc(oh*a/{1})*{1}:min(max(iw/a\,ih)\,{0})",
                     maxHeightParam,
                     scaleVal);
             }
@@ -3021,19 +3021,19 @@ namespace MediaBrowser.Controller.MediaEncoding
                 switch (threedFormat.Value)
                 {
                     case Video3DFormat.HalfSideBySide:
-                        filter = "crop=iw/2:ih:0:0,scale=(iw*2):ih,setdar=dar=a,crop=min(iw\\,ih*dar):min(ih\\,iw/dar):(iw-min(iw\\,iw*sar))/2:(ih - min (ih\\,ih/sar))/2,setsar=sar=1,scale={0}:trunc({0}/dar/2)*2";
+                        filter = @"crop=iw/2:ih:0:0,scale=(iw*2):ih,setdar=dar=a,crop=min(iw\,ih*dar):min(ih\,iw/dar):(iw-min(iw\,iw*sar))/2:(ih - min (ih\,ih/sar))/2,setsar=sar=1,scale={0}:trunc({0}/dar/2)*2";
                         // hsbs crop width in half,scale to correct size, set the display aspect,crop out any black bars we may have made the scale width to requestedWidth. Work out the correct height based on the display aspect it will maintain the aspect where -1 in this case (3d) may not.
                         break;
                     case Video3DFormat.FullSideBySide:
-                        filter = "crop=iw/2:ih:0:0,setdar=dar=a,crop=min(iw\\,ih*dar):min(ih\\,iw/dar):(iw-min(iw\\,iw*sar))/2:(ih - min (ih\\,ih/sar))/2,setsar=sar=1,scale={0}:trunc({0}/dar/2)*2";
+                        filter = @"crop=iw/2:ih:0:0,setdar=dar=a,crop=min(iw\,ih*dar):min(ih\,iw/dar):(iw-min(iw\,iw*sar))/2:(ih - min (ih\,ih/sar))/2,setsar=sar=1,scale={0}:trunc({0}/dar/2)*2";
                         // fsbs crop width in half,set the display aspect,crop out any black bars we may have made the scale width to requestedWidth.
                         break;
                     case Video3DFormat.HalfTopAndBottom:
-                        filter = "crop=iw:ih/2:0:0,scale=(iw*2):ih),setdar=dar=a,crop=min(iw\\,ih*dar):min(ih\\,iw/dar):(iw-min(iw\\,iw*sar))/2:(ih - min (ih\\,ih/sar))/2,setsar=sar=1,scale={0}:trunc({0}/dar/2)*2";
+                        filter = @"crop=iw:ih/2:0:0,scale=(iw*2):ih),setdar=dar=a,crop=min(iw\,ih*dar):min(ih\,iw/dar):(iw-min(iw\,iw*sar))/2:(ih - min (ih\,ih/sar))/2,setsar=sar=1,scale={0}:trunc({0}/dar/2)*2";
                         // htab crop height in half,scale to correct size, set the display aspect,crop out any black bars we may have made the scale width to requestedWidth
                         break;
                     case Video3DFormat.FullTopAndBottom:
-                        filter = "crop=iw:ih/2:0:0,setdar=dar=a,crop=min(iw\\,ih*dar):min(ih\\,iw/dar):(iw-min(iw\\,iw*sar))/2:(ih - min (ih\\,ih/sar))/2,setsar=sar=1,scale={0}:trunc({0}/dar/2)*2";
+                        filter = @"crop=iw:ih/2:0:0,setdar=dar=a,crop=min(iw\,ih*dar):min(ih\,iw/dar):(iw-min(iw\,iw*sar))/2:(ih - min (ih\,ih/sar))/2,setsar=sar=1,scale={0}:trunc({0}/dar/2)*2";
                         // ftab crop height in half, set the display aspect,crop out any black bars we may have made the scale width to requestedWidth
                         break;
                     default:
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 9bd99f030..0241b77a1 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -680,13 +680,13 @@ namespace MediaBrowser.MediaEncoding.Encoder
             var scaler = threedFormat switch
             {
                 // hsbs crop width in half,scale to correct size, set the display aspect,crop out any black bars we may have made. Work out the correct height based on the display aspect it will maintain the aspect where -1 in this case (3d) may not.
-                Video3DFormat.HalfSideBySide => "crop=iw/2:ih:0:0,scale=(iw*2):ih,setdar=dar=a,crop=min(iw\\,ih*dar):min(ih\\,iw/dar):(iw-min(iw\\,iw*sar))/2:(ih - min (ih\\,ih/sar))/2,setsar=sar=1",
+                Video3DFormat.HalfSideBySide => @"crop=iw/2:ih:0:0,scale=(iw*2):ih,setdar=dar=a,crop=min(iw\,ih*dar):min(ih\,iw/dar):(iw-min(iw\,iw*sar))/2:(ih - min (ih\,ih/sar))/2,setsar=sar=1",
                 // fsbs crop width in half,set the display aspect,crop out any black bars we may have made
-                Video3DFormat.FullSideBySide => "crop=iw/2:ih:0:0,setdar=dar=a,crop=min(iw\\,ih*dar):min(ih\\,iw/dar):(iw-min(iw\\,iw*sar))/2:(ih - min (ih\\,ih/sar))/2,setsar=sar=1",
+                Video3DFormat.FullSideBySide => @"crop=iw/2:ih:0:0,setdar=dar=a,crop=min(iw\,ih*dar):min(ih\,iw/dar):(iw-min(iw\,iw*sar))/2:(ih - min (ih\,ih/sar))/2,setsar=sar=1",
                 // htab crop height in half,scale to correct size, set the display aspect,crop out any black bars we may have made
-                Video3DFormat.HalfTopAndBottom => "crop=iw:ih/2:0:0,scale=(iw*2):ih),setdar=dar=a,crop=min(iw\\,ih*dar):min(ih\\,iw/dar):(iw-min(iw\\,iw*sar))/2:(ih - min (ih\\,ih/sar))/2,setsar=sar=1",
+                Video3DFormat.HalfTopAndBottom => @"crop=iw:ih/2:0:0,scale=(iw*2):ih),setdar=dar=a,crop=min(iw\,ih*dar):min(ih\,iw/dar):(iw-min(iw\,iw*sar))/2:(ih - min (ih\,ih/sar))/2,setsar=sar=1",
                 // ftab crop height in half, set the display aspect,crop out any black bars we may have made
-                Video3DFormat.FullTopAndBottom => "crop=iw:ih/2:0:0,setdar=dar=a,crop=min(iw\\,ih*dar):min(ih\\,iw/dar):(iw-min(iw\\,iw*sar))/2:(ih - min (ih\\,ih/sar))/2,setsar=sar=1",
+                Video3DFormat.FullTopAndBottom => @"crop=iw:ih/2:0:0,setdar=dar=a,crop=min(iw\,ih*dar):min(ih\,iw/dar):(iw-min(iw\,iw*sar))/2:(ih - min (ih\,ih/sar))/2,setsar=sar=1",
                 _ => "scale=trunc(iw*sar):ih"
             };
 
@@ -858,7 +858,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             // https://ffmpeg.org/ffmpeg-filters.html#Notes-on-filtergraph-escaping
             // We need to double escape
 
-            return path.Replace('\\', '/').Replace(":", "\\:", StringComparison.Ordinal).Replace("'", "'\\\\\\''", StringComparison.Ordinal);
+            return path.Replace('\\', '/').Replace(":", "\\:", StringComparison.Ordinal).Replace("'", @"'\\\''", StringComparison.Ordinal);
         }
 
         /// <inheritdoc />
diff --git a/MediaBrowser.Providers/MediaInfo/AudioFileProber.cs b/MediaBrowser.Providers/MediaInfo/AudioFileProber.cs
index 59b7c6e27..d81704227 100644
--- a/MediaBrowser.Providers/MediaInfo/AudioFileProber.cs
+++ b/MediaBrowser.Providers/MediaInfo/AudioFileProber.cs
@@ -58,7 +58,7 @@ namespace MediaBrowser.Providers.MediaInfo
             _mediaSourceManager = mediaSourceManager;
         }
 
-        [GeneratedRegex("I:\\s+(.*?)\\s+LUFS")]
+        [GeneratedRegex(@"I:\s+(.*?)\s+LUFS")]
         private static partial Regex LUFSRegex();
 
         /// <summary>
diff --git a/tests/Jellyfin.Naming.Tests/TV/EpisodePathParserTest.cs b/tests/Jellyfin.Naming.Tests/TV/EpisodePathParserTest.cs
index 7604ddc80..5397f1371 100644
--- a/tests/Jellyfin.Naming.Tests/TV/EpisodePathParserTest.cs
+++ b/tests/Jellyfin.Naming.Tests/TV/EpisodePathParserTest.cs
@@ -13,10 +13,10 @@ namespace Jellyfin.Naming.Tests.TV
         [InlineData("/media/Foo - S04E011", true, "Foo", 4, 11)]
         [InlineData("/media/Foo/Foo s01x01", true, "Foo", 1, 1)]
         [InlineData("/media/Foo (2019)/Season 4/Foo (2019).S04E03", true, "Foo (2019)", 4, 3)]
-        [InlineData("D:\\media\\Foo\\Foo-S01E01", true, "Foo", 1, 1)]
-        [InlineData("D:\\media\\Foo - S04E011", true, "Foo", 4, 11)]
-        [InlineData("D:\\media\\Foo\\Foo s01x01", true, "Foo", 1, 1)]
-        [InlineData("D:\\media\\Foo (2019)\\Season 4\\Foo (2019).S04E03", true, "Foo (2019)", 4, 3)]
+        [InlineData(@"D:\media\Foo\Foo-S01E01", true, "Foo", 1, 1)]
+        [InlineData(@"D:\media\Foo - S04E011", true, "Foo", 4, 11)]
+        [InlineData(@"D:\media\Foo\Foo s01x01", true, "Foo", 1, 1)]
+        [InlineData(@"D:\media\Foo (2019)\Season 4\Foo (2019).S04E03", true, "Foo (2019)", 4, 3)]
         [InlineData("/Season 2/Elementary - 02x03-04-15 - Ep Name.mp4", false, "Elementary", 2, 3)]
         [InlineData("/Season 1/seriesname S01E02 blah.avi", false, "seriesname", 1, 2)]
         [InlineData("/Running Man/Running Man S2017E368.mkv", false, "Running Man", 2017, 368)]
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs
index c33a957e6..1c35eb3f5 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs
@@ -48,10 +48,10 @@ namespace Jellyfin.Server.Implementations.Tests.Library
         [InlineData("C:/Users/jeff/myfile.mkv", "C:/Users/jeff", "/home/jeff", "/home/jeff/myfile.mkv")]
         [InlineData("C:/Users/jeff/myfile.mkv", "C:/Users/jeff/", "/home/jeff", "/home/jeff/myfile.mkv")]
         [InlineData("/home/jeff/music/jeff's band/consistently inconsistent.mp3", "/home/jeff/music/jeff's band", "/home/not jeff", "/home/not jeff/consistently inconsistent.mp3")]
-        [InlineData("C:\\Users\\jeff\\myfile.mkv", "C:\\Users/jeff", "/home/jeff", "/home/jeff/myfile.mkv")]
-        [InlineData("C:\\Users\\jeff\\myfile.mkv", "C:\\Users/jeff", "/home/jeff/", "/home/jeff/myfile.mkv")]
-        [InlineData("C:\\Users\\jeff\\myfile.mkv", "C:\\Users/jeff/", "/home/jeff/", "/home/jeff/myfile.mkv")]
-        [InlineData("C:\\Users\\jeff\\myfile.mkv", "C:\\Users/jeff/", "/", "/myfile.mkv")]
+        [InlineData(@"C:\Users\jeff\myfile.mkv", "C:\\Users/jeff", "/home/jeff", "/home/jeff/myfile.mkv")]
+        [InlineData(@"C:\Users\jeff\myfile.mkv", "C:\\Users/jeff", "/home/jeff/", "/home/jeff/myfile.mkv")]
+        [InlineData(@"C:\Users\jeff\myfile.mkv", "C:\\Users/jeff/", "/home/jeff/", "/home/jeff/myfile.mkv")]
+        [InlineData(@"C:\Users\jeff\myfile.mkv", "C:\\Users/jeff/", "/", "/myfile.mkv")]
         [InlineData("/o", "/o", "/s", "/s")] // regression test for #5977
         public void TryReplaceSubPath_ValidArgs_Correct(string path, string subPath, string newSubPath, string? expectedResult)
         {
@@ -78,10 +78,10 @@ namespace Jellyfin.Server.Implementations.Tests.Library
         [Theory]
         [InlineData(null, '/', null)]
         [InlineData(null, '\\', null)]
-        [InlineData("/home/jeff/myfile.mkv", '\\', "\\home\\jeff\\myfile.mkv")]
-        [InlineData("C:\\Users\\Jeff\\myfile.mkv", '/', "C:/Users/Jeff/myfile.mkv")]
-        [InlineData("\\home/jeff\\myfile.mkv", '\\', "\\home\\jeff\\myfile.mkv")]
-        [InlineData("\\home/jeff\\myfile.mkv", '/', "/home/jeff/myfile.mkv")]
+        [InlineData("/home/jeff/myfile.mkv", '\\', @"\home\jeff\myfile.mkv")]
+        [InlineData(@"C:\Users\Jeff\myfile.mkv", '/', "C:/Users/Jeff/myfile.mkv")]
+        [InlineData(@"\home/jeff\myfile.mkv", '\\', @"\home\jeff\myfile.mkv")]
+        [InlineData(@"\home/jeff\myfile.mkv", '/', "/home/jeff/myfile.mkv")]
         [InlineData("", '/', "")]
         public void NormalizePath_SpecifyingSeparator_Normalizes(string path, char separator, string expectedPath)
         {
@@ -90,8 +90,8 @@ namespace Jellyfin.Server.Implementations.Tests.Library
 
         [Theory]
         [InlineData("/home/jeff/myfile.mkv")]
-        [InlineData("C:\\Users\\Jeff\\myfile.mkv")]
-        [InlineData("\\home/jeff\\myfile.mkv")]
+        [InlineData(@"C:\Users\Jeff\myfile.mkv")]
+        [InlineData(@"\home/jeff\myfile.mkv")]
         public void NormalizePath_NoArgs_UsesDirectorySeparatorChar(string path)
         {
             var separator = Path.DirectorySeparatorChar;
@@ -101,8 +101,8 @@ namespace Jellyfin.Server.Implementations.Tests.Library
 
         [Theory]
         [InlineData("/home/jeff/myfile.mkv", '/')]
-        [InlineData("C:\\Users\\Jeff\\myfile.mkv", '\\')]
-        [InlineData("\\home/jeff\\myfile.mkv", '/')]
+        [InlineData(@"C:\Users\Jeff\myfile.mkv", '\\')]
+        [InlineData(@"\home/jeff\myfile.mkv", '/')]
         public void NormalizePath_OutVar_Correct(string path, char expectedSeparator)
         {
             var result = path.NormalizePath(out var separator);
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Plugins/PluginManagerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Plugins/PluginManagerTests.cs
index f2a08e43c..934024826 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Plugins/PluginManagerTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Plugins/PluginManagerTests.cs
@@ -119,8 +119,8 @@ namespace Jellyfin.Server.Implementations.Tests.Plugins
         [InlineData("C:\\some.dll")] // Windows root path.
         [InlineData("test.txt")] // Not a DLL
         [InlineData(".././.././../some.dll")] // Traversal with current and parent
-        [InlineData("..\\.\\..\\.\\..\\some.dll")] // Windows traversal with current and parent
-        [InlineData("\\\\network\\resource.dll")] // UNC Path
+        [InlineData(@"..\.\..\.\..\some.dll")] // Windows traversal with current and parent
+        [InlineData(@"\\network\resource.dll")] // UNC Path
         [InlineData("https://jellyfin.org/some.dll")] // URL
         [InlineData("~/some.dll")] // Tilde poses a shell expansion risk, but is a valid path character.
         public void Constructor_DiscoversUnsafePluginAssembly_Status_Malfunctioned(string unsafePath)
diff --git a/tests/Jellyfin.XbmcMetadata.Tests/Parsers/MovieNfoParserTests.cs b/tests/Jellyfin.XbmcMetadata.Tests/Parsers/MovieNfoParserTests.cs
index f56f58c6f..0a153b9cc 100644
--- a/tests/Jellyfin.XbmcMetadata.Tests/Parsers/MovieNfoParserTests.cs
+++ b/tests/Jellyfin.XbmcMetadata.Tests/Parsers/MovieNfoParserTests.cs
@@ -60,7 +60,7 @@ namespace Jellyfin.XbmcMetadata.Tests.Parsers
             {
                 Exists = true,
                 FullName = OperatingSystem.IsWindows() ?
-                    "C:\\media\\movies\\Justice League (2017).jpg"
+                    @"C:\media\movies\Justice League (2017).jpg"
                     : "/media/movies/Justice League (2017).jpg"
             };
             directoryService.Setup(x => x.GetFile(_localImageFileMetadata.FullName))
-- 
cgit v1.2.3


From 2d7835c848cecd11b3fa29f0d1df1d73001a33ac Mon Sep 17 00:00:00 2001
From: Stepan Goremykin <goremukin@gmail.com>
Date: Sun, 8 Oct 2023 01:16:43 +0200
Subject: Join declaration and assignment

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 4 +---
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs      | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 03c778c07..8d51c800f 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1745,11 +1745,9 @@ namespace MediaBrowser.Controller.MediaEncoding
                 // Values 0-3, 0 being highest quality but slower
                 var profileScore = 0;
 
-                string crf;
                 var qmin = "0";
                 var qmax = "50";
-
-                crf = "10";
+                var crf = "10";
 
                 if (isVc1)
                 {
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 0241b77a1..ef4c9608c 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -625,9 +625,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         private string GetImageResolutionParameter()
         {
-            string imageResolutionParameter;
-
-            imageResolutionParameter = _serverConfig.Configuration.ChapterImageResolution switch
+            var imageResolutionParameter = _serverConfig.Configuration.ChapterImageResolution switch
             {
                 ImageResolution.P144 => "256x144",
                 ImageResolution.P240 => "426x240",
-- 
cgit v1.2.3


From 212976277d43a1d9a4186c6536e4a8cb3eefd639 Mon Sep 17 00:00:00 2001
From: Stepan Goremykin <goremukin@gmail.com>
Date: Sun, 8 Oct 2023 01:17:32 +0200
Subject: Remove redundant ToString call for value types

---
 Emby.Server.Implementations/Data/SqliteItemRepository.cs | 2 +-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 77cf4089b..82d1d0b4e 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -4382,7 +4382,7 @@ namespace Emby.Server.Implementations.Data
 
                 foreach (var videoType in query.VideoTypes)
                 {
-                    videoTypes.Add("data like '%\"VideoType\":\"" + videoType.ToString() + "\"%'");
+                    videoTypes.Add("data like '%\"VideoType\":\"" + videoType + "\"%'");
                 }
 
                 whereClauses.Add("(" + string.Join(" OR ", videoTypes) + ")");
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index ef4c9608c..07460aaa3 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -424,7 +424,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             if (request.MediaSource.AnalyzeDurationMs > 0)
             {
-                analyzeDuration = "-analyzeduration " + (request.MediaSource.AnalyzeDurationMs * 1000).ToString();
+                analyzeDuration = "-analyzeduration " + (request.MediaSource.AnalyzeDurationMs * 1000);
             }
             else if (!string.IsNullOrEmpty(ffmpegAnalyzeDuration))
             {
-- 
cgit v1.2.3


From c707baed8366cd44ea80713cf93e5f92971815bf Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Thu, 5 Oct 2023 23:57:11 +0200
Subject: Jellyfin.Drawing minor improvements

Reduce duplicate/dead code
---
 MediaBrowser.Controller/Drawing/IImageProcessor.cs | 11 -----
 .../Drawing/ImageProcessingOptions.cs              |  3 +-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 10 +---
 .../Drawing/ImageFormatExtensions.cs               | 17 +++++++
 .../MediaInfo/EmbeddedImageProvider.cs             |  6 ---
 src/Jellyfin.Drawing.Skia/SkiaEncoder.cs           | 14 +-----
 src/Jellyfin.Drawing/ImageProcessor.cs             | 56 +---------------------
 .../Drawing/ImageFormatExtensionsTests.cs          | 13 +++++
 8 files changed, 37 insertions(+), 93 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
index cdc3d52b9..0d1e2a5a0 100644
--- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs
+++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Threading.Tasks;
 using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Entities;
@@ -70,14 +69,6 @@ namespace MediaBrowser.Controller.Drawing
 
         string? GetImageCacheTag(User user);
 
-        /// <summary>
-        /// Processes the image.
-        /// </summary>
-        /// <param name="options">The options.</param>
-        /// <param name="toStream">To stream.</param>
-        /// <returns>Task.</returns>
-        Task ProcessImage(ImageProcessingOptions options, Stream toStream);
-
         /// <summary>
         /// Processes the image.
         /// </summary>
@@ -97,7 +88,5 @@ namespace MediaBrowser.Controller.Drawing
         /// <param name="options">The options.</param>
         /// <param name="libraryName">The library name to draw onto the collage.</param>
         void CreateImageCollage(ImageCollageOptions options, string? libraryName);
-
-        bool SupportsTransparency(string path);
     }
 }
diff --git a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
index 7912c5e87..953cfe698 100644
--- a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
+++ b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
@@ -119,7 +119,8 @@ namespace MediaBrowser.Controller.Drawing
         private bool IsFormatSupported(string originalImagePath)
         {
             var ext = Path.GetExtension(originalImagePath);
-            return SupportedOutputFormats.Any(outputFormat => string.Equals(ext, "." + outputFormat, StringComparison.OrdinalIgnoreCase));
+            ext = ext.Replace(".jpeg", ".jpg", StringComparison.OrdinalIgnoreCase);
+            return SupportedOutputFormats.Any(outputFormat => string.Equals(ext, outputFormat.GetExtension(), StringComparison.OrdinalIgnoreCase));
         }
     }
 }
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 4bff19665..26f47a18f 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -650,15 +650,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         {
             ArgumentException.ThrowIfNullOrEmpty(inputPath);
 
-            var outputExtension = targetFormat switch
-            {
-                ImageFormat.Bmp => ".bmp",
-                ImageFormat.Gif => ".gif",
-                ImageFormat.Jpg => ".jpg",
-                ImageFormat.Png => ".png",
-                ImageFormat.Webp => ".webp",
-                _ => ".jpg"
-            };
+            var outputExtension = targetFormat?.GetExtension() ?? ".jpg";
 
             var tempExtractPath = Path.Combine(_configurationManager.ApplicationPaths.TempDirectory, Guid.NewGuid() + outputExtension);
             Directory.CreateDirectory(Path.GetDirectoryName(tempExtractPath));
diff --git a/MediaBrowser.Model/Drawing/ImageFormatExtensions.cs b/MediaBrowser.Model/Drawing/ImageFormatExtensions.cs
index 68a5c2534..1bb24112e 100644
--- a/MediaBrowser.Model/Drawing/ImageFormatExtensions.cs
+++ b/MediaBrowser.Model/Drawing/ImageFormatExtensions.cs
@@ -24,4 +24,21 @@ public static class ImageFormatExtensions
             ImageFormat.Webp => "image/webp",
             _ => throw new InvalidEnumArgumentException(nameof(format), (int)format, typeof(ImageFormat))
         };
+
+    /// <summary>
+    /// Returns the correct extension for this <see cref="ImageFormat" />.
+    /// </summary>
+    /// <param name="format">This <see cref="ImageFormat" />.</param>
+    /// <exception cref="InvalidEnumArgumentException">The <paramref name="format"/> is an invalid enumeration value.</exception>
+    /// <returns>The correct extension for this <see cref="ImageFormat" />.</returns>
+    public static string GetExtension(this ImageFormat format)
+        => format switch
+        {
+            ImageFormat.Bmp => ".bmp",
+            ImageFormat.Gif => ".gif",
+            ImageFormat.Jpg => ".jpg",
+            ImageFormat.Png => ".png",
+            ImageFormat.Webp => ".webp",
+            _ => throw new InvalidEnumArgumentException(nameof(format), (int)format, typeof(ImageFormat))
+        };
 }
diff --git a/MediaBrowser.Providers/MediaInfo/EmbeddedImageProvider.cs b/MediaBrowser.Providers/MediaInfo/EmbeddedImageProvider.cs
index c24f4e2fc..0bfee07fd 100644
--- a/MediaBrowser.Providers/MediaInfo/EmbeddedImageProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/EmbeddedImageProvider.cs
@@ -204,16 +204,10 @@ namespace MediaBrowser.Providers.MediaInfo
                 ? Path.GetExtension(attachmentStream.FileName)
                 : MimeTypes.ToExtension(attachmentStream.MimeType);
 
-            if (string.IsNullOrEmpty(extension))
-            {
-                extension = ".jpg";
-            }
-
             ImageFormat format = extension switch
             {
                 ".bmp" => ImageFormat.Bmp,
                 ".gif" => ImageFormat.Gif,
-                ".jpg" => ImageFormat.Jpg,
                 ".png" => ImageFormat.Png,
                 ".webp" => ImageFormat.Webp,
                 _ => ImageFormat.Jpg
diff --git a/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs b/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
index 416f60217..03f90da8e 100644
--- a/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
+++ b/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
@@ -200,20 +200,10 @@ public class SkiaEncoder : IImageEncoder
     {
         if (!orientation.HasValue)
         {
-            return SKEncodedOrigin.TopLeft;
+            return SKEncodedOrigin.Default;
         }
 
-        return orientation.Value switch
-        {
-            ImageOrientation.TopRight => SKEncodedOrigin.TopRight,
-            ImageOrientation.RightTop => SKEncodedOrigin.RightTop,
-            ImageOrientation.RightBottom => SKEncodedOrigin.RightBottom,
-            ImageOrientation.LeftTop => SKEncodedOrigin.LeftTop,
-            ImageOrientation.LeftBottom => SKEncodedOrigin.LeftBottom,
-            ImageOrientation.BottomRight => SKEncodedOrigin.BottomRight,
-            ImageOrientation.BottomLeft => SKEncodedOrigin.BottomLeft,
-            _ => SKEncodedOrigin.TopLeft
-        };
+        return (SKEncodedOrigin)orientation.Value;
     }
 
     /// <summary>
diff --git a/src/Jellyfin.Drawing/ImageProcessor.cs b/src/Jellyfin.Drawing/ImageProcessor.cs
index 4f16e294b..65a8f4e83 100644
--- a/src/Jellyfin.Drawing/ImageProcessor.cs
+++ b/src/Jellyfin.Drawing/ImageProcessor.cs
@@ -107,22 +107,10 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
     /// <inheritdoc />
     public bool SupportsImageCollageCreation => _imageEncoder.SupportsImageCollageCreation;
 
-    /// <inheritdoc />
-    public async Task ProcessImage(ImageProcessingOptions options, Stream toStream)
-    {
-        var file = await ProcessImage(options).ConfigureAwait(false);
-        using var fileStream = AsyncFile.OpenRead(file.Path);
-        await fileStream.CopyToAsync(toStream).ConfigureAwait(false);
-    }
-
     /// <inheritdoc />
     public IReadOnlyCollection<ImageFormat> GetSupportedImageOutputFormats()
         => _imageEncoder.SupportedOutputFormats;
 
-    /// <inheritdoc />
-    public bool SupportsTransparency(string path)
-        => _transparentImageTypes.Contains(Path.GetExtension(path));
-
     /// <inheritdoc />
     public async Task<(string Path, string? MimeType, DateTime DateModified)> ProcessImage(ImageProcessingOptions options)
     {
@@ -224,7 +212,7 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
                 }
             }
 
-            return (cacheFilePath, GetMimeType(outputFormat, cacheFilePath), _fileSystem.GetLastWriteTimeUtc(cacheFilePath));
+            return (cacheFilePath, outputFormat.GetMimeType(), _fileSystem.GetLastWriteTimeUtc(cacheFilePath));
         }
         catch (Exception ex)
         {
@@ -262,17 +250,6 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
         return ImageFormat.Jpg;
     }
 
-    private string GetMimeType(ImageFormat format, string path)
-        => format switch
-        {
-            ImageFormat.Bmp => MimeTypes.GetMimeType("i.bmp"),
-            ImageFormat.Gif => MimeTypes.GetMimeType("i.gif"),
-            ImageFormat.Jpg => MimeTypes.GetMimeType("i.jpg"),
-            ImageFormat.Png => MimeTypes.GetMimeType("i.png"),
-            ImageFormat.Webp => MimeTypes.GetMimeType("i.webp"),
-            _ => MimeTypes.GetMimeType(path)
-        };
-
     /// <summary>
     /// Gets the cache file path based on a set of parameters.
     /// </summary>
@@ -374,7 +351,7 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
         filename.Append(",v=");
         filename.Append(Version);
 
-        return GetCachePath(ResizedImageCachePath, filename.ToString(), "." + format.ToString().ToLowerInvariant());
+        return GetCachePath(ResizedImageCachePath, filename.ToString(), format.GetExtension());
     }
 
     /// <inheritdoc />
@@ -471,35 +448,6 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
             return Task.FromResult((originalImagePath, dateModified));
         }
 
-        // TODO _mediaEncoder.ConvertImage is not implemented
-        // if (!_imageEncoder.SupportedInputFormats.Contains(inputFormat))
-        // {
-        //     try
-        //     {
-        //         string filename = (originalImagePath + dateModified.Ticks.ToString(CultureInfo.InvariantCulture)).GetMD5().ToString("N", CultureInfo.InvariantCulture);
-        //
-        //         string cacheExtension = _mediaEncoder.SupportsEncoder("libwebp") ? ".webp" : ".png";
-        //         var outputPath = Path.Combine(_appPaths.ImageCachePath, "converted-images", filename + cacheExtension);
-        //
-        //         var file = _fileSystem.GetFileInfo(outputPath);
-        //         if (!file.Exists)
-        //         {
-        //             await _mediaEncoder.ConvertImage(originalImagePath, outputPath).ConfigureAwait(false);
-        //             dateModified = _fileSystem.GetLastWriteTimeUtc(outputPath);
-        //         }
-        //         else
-        //         {
-        //             dateModified = file.LastWriteTimeUtc;
-        //         }
-        //
-        //         originalImagePath = outputPath;
-        //     }
-        //     catch (Exception ex)
-        //     {
-        //         _logger.LogError(ex, "Image conversion failed for {Path}", originalImagePath);
-        //     }
-        // }
-
         return Task.FromResult((originalImagePath, dateModified));
     }
 
diff --git a/tests/Jellyfin.Model.Tests/Drawing/ImageFormatExtensionsTests.cs b/tests/Jellyfin.Model.Tests/Drawing/ImageFormatExtensionsTests.cs
index a5bdb42d8..198ad5a27 100644
--- a/tests/Jellyfin.Model.Tests/Drawing/ImageFormatExtensionsTests.cs
+++ b/tests/Jellyfin.Model.Tests/Drawing/ImageFormatExtensionsTests.cs
@@ -30,4 +30,17 @@ public static class ImageFormatExtensionsTests
     [InlineData((ImageFormat)5)]
     public static void GetMimeType_Valid_ThrowsInvalidEnumArgumentException(ImageFormat format)
         => Assert.Throws<InvalidEnumArgumentException>(() => format.GetMimeType());
+
+    [Theory]
+    [MemberData(nameof(GetAllImageFormats))]
+    public static void GetExtension_Valid_Valid(ImageFormat format)
+        => Assert.Null(Record.Exception(() => format.GetExtension()));
+
+    [Theory]
+    [InlineData((ImageFormat)int.MinValue)]
+    [InlineData((ImageFormat)int.MaxValue)]
+    [InlineData((ImageFormat)(-1))]
+    [InlineData((ImageFormat)5)]
+    public static void GetExtension_Valid_ThrowsInvalidEnumArgumentException(ImageFormat format)
+        => Assert.Throws<InvalidEnumArgumentException>(() => format.GetExtension());
 }
-- 
cgit v1.2.3


From 4757ce105bedb075c6663d92bc1e93f87c4779f2 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Tue, 10 Oct 2023 00:18:50 +0200
Subject: Use Process.WaitForExitAsync added in .NET 5

---
 .../Extensions/ProcessExtensions.cs                | 60 ++--------------------
 .../Attachments/AttachmentExtractor.cs             | 44 ++++++----------
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 22 ++++----
 .../Subtitles/SubtitleEncoder.cs                   | 46 ++++++-----------
 4 files changed, 46 insertions(+), 126 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.Common/Extensions/ProcessExtensions.cs b/MediaBrowser.Common/Extensions/ProcessExtensions.cs
index c3a7cb394..bb8ab130d 100644
--- a/MediaBrowser.Common/Extensions/ProcessExtensions.cs
+++ b/MediaBrowser.Common/Extensions/ProcessExtensions.cs
@@ -15,65 +15,13 @@ namespace MediaBrowser.Common.Extensions
         /// </summary>
         /// <param name="process">The process to wait for.</param>
         /// <param name="timeout">The duration to wait before cancelling waiting for the task.</param>
-        /// <returns>True if the task exited normally, false if the timeout elapsed before the process exited.</returns>
-        /// <exception cref="InvalidOperationException">If <see cref="Process.EnableRaisingEvents"/> is not set to true for the process.</exception>
-        public static async Task<bool> WaitForExitAsync(this Process process, TimeSpan timeout)
+        /// <returns>A task that will complete when the process has exited, cancellation has been requested, or an error occurs.</returns>
+        /// <exception cref="OperationCanceledException">The timeout ended.</exception>
+        public static async Task WaitForExitAsync(this Process process, TimeSpan timeout)
         {
             using (var cancelTokenSource = new CancellationTokenSource(timeout))
             {
-                return await WaitForExitAsync(process, cancelTokenSource.Token).ConfigureAwait(false);
-            }
-        }
-
-        /// <summary>
-        /// Asynchronously wait for the process to exit.
-        /// </summary>
-        /// <param name="process">The process to wait for.</param>
-        /// <param name="cancelToken">A <see cref="CancellationToken"/> to observe while waiting for the process to exit.</param>
-        /// <returns>True if the task exited normally, false if cancelled before the process exited.</returns>
-        public static async Task<bool> WaitForExitAsync(this Process process, CancellationToken cancelToken)
-        {
-            if (!process.EnableRaisingEvents)
-            {
-                throw new InvalidOperationException("EnableRisingEvents must be enabled to async wait for a task to exit.");
-            }
-
-            // Add an event handler for the process exit event
-            var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-            process.Exited += (_, _) => tcs.TrySetResult(true);
-
-            // Return immediately if the process has already exited
-            if (process.HasExitedSafe())
-            {
-                return true;
-            }
-
-            // Register with the cancellation token then await
-            using (var cancelRegistration = cancelToken.Register(() => tcs.TrySetResult(process.HasExitedSafe())))
-            {
-                return await tcs.Task.ConfigureAwait(false);
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the associated process has been terminated using
-        /// <see cref="Process.HasExited"/>. This is safe to call even if there is no operating system process
-        /// associated with the <see cref="Process"/>.
-        /// </summary>
-        /// <param name="process">The process to check the exit status for.</param>
-        /// <returns>
-        /// True if the operating system process referenced by the <see cref="Process"/> component has
-        /// terminated, or if there is no associated operating system process; otherwise, false.
-        /// </returns>
-        private static bool HasExitedSafe(this Process process)
-        {
-            try
-            {
-                return process.HasExited;
-            }
-            catch (InvalidOperationException)
-            {
-                return true;
+                await process.WaitForExitAsync(cancelTokenSource.Token).ConfigureAwait(false);
             }
         }
     }
diff --git a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
index 0ec0c84d4..299f294b2 100644
--- a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
+++ b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
@@ -174,22 +174,16 @@ namespace MediaBrowser.MediaEncoding.Attachments
 
                 process.Start();
 
-                var ranToCompletion = await ProcessExtensions.WaitForExitAsync(process, cancellationToken).ConfigureAwait(false);
-
-                if (!ranToCompletion)
+                try
                 {
-                    try
-                    {
-                        _logger.LogWarning("Killing ffmpeg attachment extraction process");
-                        process.Kill();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Error killing attachment extraction process");
-                    }
+                    await process.WaitForExitAsync(cancellationToken).ConfigureAwait(false);
+                    exitCode = process.ExitCode;
+                }
+                catch (OperationCanceledException)
+                {
+                    process.Kill(true);
+                    exitCode = -1;
                 }
-
-                exitCode = ranToCompletion ? process.ExitCode : -1;
             }
 
             var failed = false;
@@ -322,22 +316,16 @@ namespace MediaBrowser.MediaEncoding.Attachments
 
                 process.Start();
 
-                var ranToCompletion = await ProcessExtensions.WaitForExitAsync(process, cancellationToken).ConfigureAwait(false);
-
-                if (!ranToCompletion)
+                try
                 {
-                    try
-                    {
-                        _logger.LogWarning("Killing ffmpeg attachment extraction process");
-                        process.Kill();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Error killing attachment extraction process");
-                    }
+                    await process.WaitForExitAsync(cancellationToken).ConfigureAwait(false);
+                    exitCode = process.ExitCode;
+                }
+                catch (OperationCanceledException)
+                {
+                    process.Kill(true);
+                    exitCode = -1;
                 }
-
-                exitCode = ranToCompletion ? process.ExitCode : -1;
             }
 
             var failed = false;
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 4bff19665..0eaf9748f 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -760,11 +760,15 @@ namespace MediaBrowser.MediaEncoding.Encoder
                         timeoutMs = enableHdrExtraction ? DefaultHdrImageExtractionTimeout : DefaultSdrImageExtractionTimeout;
                     }
 
-                    ranToCompletion = await process.WaitForExitAsync(TimeSpan.FromMilliseconds(timeoutMs)).ConfigureAwait(false);
-
-                    if (!ranToCompletion)
+                    try
+                    {
+                        await process.WaitForExitAsync(TimeSpan.FromMilliseconds(timeoutMs)).ConfigureAwait(false);
+                        ranToCompletion = true;
+                    }
+                    catch (OperationCanceledException)
                     {
-                        StopProcess(processWrapper, 1000);
+                        process.Kill(true);
+                        ranToCompletion = false;
                     }
                 }
                 finally
@@ -999,7 +1003,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             return true;
         }
 
-        private class ProcessWrapper : IDisposable
+        private sealed class ProcessWrapper : IDisposable
         {
             private readonly MediaEncoder _mediaEncoder;
 
@@ -1042,13 +1046,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                     _mediaEncoder._runningProcesses.Remove(this);
                 }
 
-                try
-                {
-                    process.Dispose();
-                }
-                catch
-                {
-                }
+                process.Dispose();
             }
 
             public void Dispose()
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index a41e0b7e9..21fa4468e 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -420,23 +420,16 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     throw;
                 }
 
-                var ranToCompletion = await process.WaitForExitAsync(TimeSpan.FromMinutes(30)).ConfigureAwait(false);
-
-                if (!ranToCompletion)
+                try
                 {
-                    try
-                    {
-                        _logger.LogInformation("Killing ffmpeg subtitle conversion process");
-
-                        process.Kill();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Error killing subtitle conversion process");
-                    }
+                    await process.WaitForExitAsync(TimeSpan.FromMinutes(30)).ConfigureAwait(false);
+                    exitCode = process.ExitCode;
+                }
+                catch (OperationCanceledException)
+                {
+                    process.Kill(true);
+                    exitCode = -1;
                 }
-
-                exitCode = ranToCompletion ? process.ExitCode : -1;
             }
 
             var failed = false;
@@ -574,23 +567,16 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     throw;
                 }
 
-                var ranToCompletion = await process.WaitForExitAsync(TimeSpan.FromMinutes(30)).ConfigureAwait(false);
-
-                if (!ranToCompletion)
+                try
                 {
-                    try
-                    {
-                        _logger.LogWarning("Killing ffmpeg subtitle extraction process");
-
-                        process.Kill();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Error killing subtitle extraction process");
-                    }
+                    await process.WaitForExitAsync(TimeSpan.FromMinutes(30)).ConfigureAwait(false);
+                    exitCode = process.ExitCode;
+                }
+                catch (OperationCanceledException)
+                {
+                    process.Kill(true);
+                    exitCode = -1;
                 }
-
-                exitCode = ranToCompletion ? process.ExitCode : -1;
             }
 
             var failed = false;
-- 
cgit v1.2.3


From 6b94d55e1ef7ca95e0ddc2a88b0ff0fd63d630a9 Mon Sep 17 00:00:00 2001
From: Nick <20588554+nicknsy@users.noreply.github.com>
Date: Wed, 18 Oct 2023 20:01:40 -0700
Subject: Fix for new WaitForExitAsync method

---
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 0b603715d..4668b8bbb 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -920,14 +920,22 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                     bool isResponsive = true;
                     int lastCount = 0;
+                    var timeoutMs = _configurationManager.Configuration.ImageExtractionTimeoutMs;
+                    timeoutMs = timeoutMs <= 0 ? DefaultHdrImageExtractionTimeout : timeoutMs;
 
                     while (isResponsive)
                     {
-                        if (await process.WaitForExitAsync(TimeSpan.FromSeconds(30)).ConfigureAwait(false))
+                        try
                         {
+                            await process.WaitForExitAsync(TimeSpan.FromMilliseconds(timeoutMs)).ConfigureAwait(false);
+
                             ranToCompletion = true;
                             break;
                         }
+                        catch (OperationCanceledException)
+                        {
+                            // We don't actually expect the process to be finished in one timeout span, just that one image has been generated.
+                        }
 
                         cancellationToken.ThrowIfCancellationRequested();
 
@@ -939,7 +947,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                     if (!ranToCompletion)
                     {
-                        _logger.LogInformation("Killing ffmpeg extraction process due to inactivity.");
+                        _logger.LogInformation("Stopping trickplay extraction due to process inactivity.");
                         StopProcess(processWrapper, 1000);
                     }
                 }
-- 
cgit v1.2.3


From 8ee9a0adf9f4b1ea72a4bbe322ef7941975a4b70 Mon Sep 17 00:00:00 2001
From: Vincent Lark <v.lark@astonitf.com>
Date: Sat, 21 Oct 2023 23:57:05 +0200
Subject: Forward user_agent config to ffprobe

---
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |  6 +++
 .../Probing/ProbeExternalSourcesTests.cs           | 47 ++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeExternalSourcesTests.cs

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 4668b8bbb..e8041f198 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -418,6 +418,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         public Task<MediaInfo> GetMediaInfo(MediaInfoRequest request, CancellationToken cancellationToken)
         {
             var extractChapters = request.MediaType == DlnaProfileType.Video && request.ExtractChapters;
+            var requiredHeaders = request.MediaSource.RequiredHttpHeaders;
             var analyzeDuration = string.Empty;
             var ffmpegAnalyzeDuration = _config.GetFFmpegAnalyzeDuration() ?? string.Empty;
             var ffmpegProbeSize = _config.GetFFmpegProbeSize() ?? string.Empty;
@@ -442,6 +443,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 extraArgs += " -probesize " + ffmpegProbeSize;
             }
 
+            if (requiredHeaders.ContainsKey("user_agent"))
+            {
+                extraArgs += " -user_agent " + requiredHeaders["user_agent"];
+            }
+
             return GetMediaInfoInternal(
                 GetInputArgument(request.MediaSource.Path, request.MediaSource),
                 request.MediaSource.Path,
diff --git a/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeExternalSourcesTests.cs b/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeExternalSourcesTests.cs
new file mode 100644
index 000000000..17f8ec163
--- /dev/null
+++ b/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeExternalSourcesTests.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.Threading;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.MediaEncoding.Encoder;
+using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.MediaInfo;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Xunit;
+
+namespace Jellyfin.MediaEncoding.Tests.Probing
+{
+    public class ProbeExternalSourcesTests
+    {
+        [Fact]
+        public void GetMediaInfo_Uses_UserAgent()
+        {
+            var encoder = new MediaEncoder(
+                Mock.Of<ILogger<MediaEncoder>>(),
+                Mock.Of<IServerConfigurationManager>(),
+                Mock.Of<IFileSystem>(),
+                Mock.Of<IBlurayExaminer>(),
+                Mock.Of<ILocalizationManager>(),
+                new ConfigurationBuilder().Build(),
+                Mock.Of<IServerConfigurationManager>());
+
+            var req = new MediaBrowser.Controller.MediaEncoding.MediaInfoRequest()
+            {
+                MediaSource = new MediaBrowser.Model.Dto.MediaSourceInfo
+                {
+                    Path = "/path/to/stream",
+                    Protocol = MediaProtocol.Http,
+                    RequiredHttpHeaders = new Dictionary<string, string>()
+                    {
+                        { "user_agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/530.35 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/530.35" },
+                    }
+                },
+                ExtractChapters = false,
+                MediaType = MediaBrowser.Model.Dlna.DlnaProfileType.Video,
+            };
+
+            encoder.GetMediaInfo(req, CancellationToken.None);
+        }
+    }
+}
-- 
cgit v1.2.3


From 123c6e7d1bc3a9459eb54697c293763b753b7295 Mon Sep 17 00:00:00 2001
From: Vincent Lark <v.lark@astonitf.com>
Date: Thu, 26 Oct 2023 20:06:45 +0200
Subject: Extract the MediaEncoder probing command arguments builder

---
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 32 +++++++++++++---------
 .../Probing/ProbeExternalSourcesTests.cs           | 11 +++++---
 2 files changed, 26 insertions(+), 17 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index e8041f198..4dbefca4b 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -418,10 +418,24 @@ namespace MediaBrowser.MediaEncoding.Encoder
         public Task<MediaInfo> GetMediaInfo(MediaInfoRequest request, CancellationToken cancellationToken)
         {
             var extractChapters = request.MediaType == DlnaProfileType.Video && request.ExtractChapters;
-            var requiredHeaders = request.MediaSource.RequiredHttpHeaders;
-            var analyzeDuration = string.Empty;
+            var extraArgs = GetExtraArguments(request);
+
+            return GetMediaInfoInternal(
+                GetInputArgument(request.MediaSource.Path, request.MediaSource),
+                request.MediaSource.Path,
+                request.MediaSource.Protocol,
+                extractChapters,
+                extraArgs,
+                request.MediaType == DlnaProfileType.Audio,
+                request.MediaSource.VideoType,
+                cancellationToken);
+        }
+
+        internal string GetExtraArguments(MediaInfoRequest request)
+        {
             var ffmpegAnalyzeDuration = _config.GetFFmpegAnalyzeDuration() ?? string.Empty;
             var ffmpegProbeSize = _config.GetFFmpegProbeSize() ?? string.Empty;
+            var analyzeDuration = string.Empty;
             var extraArgs = string.Empty;
 
             if (request.MediaSource.AnalyzeDurationMs > 0)
@@ -443,20 +457,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 extraArgs += " -probesize " + ffmpegProbeSize;
             }
 
-            if (requiredHeaders.ContainsKey("user_agent"))
+            if (request.MediaSource.RequiredHttpHeaders.TryGetValue("user_agent", out var userAgent))
             {
-                extraArgs += " -user_agent " + requiredHeaders["user_agent"];
+                extraArgs += " -user_agent " + userAgent;
             }
 
-            return GetMediaInfoInternal(
-                GetInputArgument(request.MediaSource.Path, request.MediaSource),
-                request.MediaSource.Path,
-                request.MediaSource.Protocol,
-                extractChapters,
-                extraArgs,
-                request.MediaType == DlnaProfileType.Audio,
-                request.MediaSource.VideoType,
-                cancellationToken);
+            return extraArgs;
         }
 
         /// <inheritdoc />
diff --git a/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeExternalSourcesTests.cs b/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeExternalSourcesTests.cs
index 17f8ec163..263f74c90 100644
--- a/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeExternalSourcesTests.cs
+++ b/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeExternalSourcesTests.cs
@@ -1,5 +1,5 @@
+using System;
 using System.Collections.Generic;
-using System.Threading;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.MediaEncoding.Encoder;
 using MediaBrowser.Model.Globalization;
@@ -15,7 +15,7 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
     public class ProbeExternalSourcesTests
     {
         [Fact]
-        public void GetMediaInfo_Uses_UserAgent()
+        public void GetExtraArguments_Forwards_UserAgent()
         {
             var encoder = new MediaEncoder(
                 Mock.Of<ILogger<MediaEncoder>>(),
@@ -26,6 +26,7 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
                 new ConfigurationBuilder().Build(),
                 Mock.Of<IServerConfigurationManager>());
 
+            var userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64)";
             var req = new MediaBrowser.Controller.MediaEncoding.MediaInfoRequest()
             {
                 MediaSource = new MediaBrowser.Model.Dto.MediaSourceInfo
@@ -34,14 +35,16 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
                     Protocol = MediaProtocol.Http,
                     RequiredHttpHeaders = new Dictionary<string, string>()
                     {
-                        { "user_agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/530.35 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/530.35" },
+                        { "user_agent", userAgent },
                     }
                 },
                 ExtractChapters = false,
                 MediaType = MediaBrowser.Model.Dlna.DlnaProfileType.Video,
             };
 
-            encoder.GetMediaInfo(req, CancellationToken.None);
+            var extraArg = encoder.GetExtraArguments(req);
+
+            Assert.Contains(userAgent, extraArg, StringComparison.InvariantCulture);
         }
     }
 }
-- 
cgit v1.2.3