Backport pull request #12550 from jellyfin/release-10.9.z

Create and use FormattingStreamWriter

Original-merge: cd2f2ca17800f71c8d94a6e043b49b7c4200e254

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Joshua M. Boniface <joshua@boniface.me>

5 files changed, 63 insertions, 7 deletions

diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 5c54f014c..46bad3f3b 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -180,10 +180,7 @@ namespace MediaBrowser.Controller.Entities.TV
         }
 
         public string FindSeriesPresentationUniqueKey()
-        {
-            var series = Series;
-            return series is null ? null : series.PresentationUniqueKey;
-        }
+            => Series?.PresentationUniqueKey;
 
         public string FindSeasonName()
         {
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index 2fda7ee6f..420349f35 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -430,8 +430,6 @@ namespace MediaBrowser.Controller.Entities
             InternalItemsQuery query,
             ILibraryManager libraryManager)
         {
-            var user = query.User;
-
             // This must be the last filter
             if (!query.AdjacentTo.IsNullOrEmpty())
             {
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 7091d5153..5e2e90c68 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -1206,7 +1206,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             // Generate concat configuration entries for each file and write to file
             Directory.CreateDirectory(Path.GetDirectoryName(concatFilePath));
-            using StreamWriter sw = new StreamWriter(concatFilePath);
+            using StreamWriter sw = new FormattingStreamWriter(concatFilePath, CultureInfo.InvariantCulture);
             foreach (var path in files)
             {
                 var mediaInfoResult = GetMediaInfo(
diff --git a/src/Jellyfin.Extensions/FormattingStreamWriter.cs b/src/Jellyfin.Extensions/FormattingStreamWriter.cs
new file mode 100644
index 000000000..40e3c5a68
--- /dev/null
+++ b/src/Jellyfin.Extensions/FormattingStreamWriter.cs
@@ -0,0 +1,38 @@
+using System;
+using System.IO;
+
+namespace Jellyfin.Extensions;
+
+/// <summary>
+/// A custom StreamWriter which supports setting a IFormatProvider.
+/// </summary>
+public class FormattingStreamWriter : StreamWriter
+{
+    private readonly IFormatProvider _formatProvider;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FormattingStreamWriter"/> class.
+    /// </summary>
+    /// <param name="stream">The stream to write to.</param>
+    /// <param name="formatProvider">The format provider to use.</param>
+    public FormattingStreamWriter(Stream stream, IFormatProvider formatProvider)
+        : base(stream)
+    {
+        _formatProvider = formatProvider;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FormattingStreamWriter"/> class.
+    /// </summary>
+    /// <param name="path">The complete file path to write to.</param>
+    /// <param name="formatProvider">The format provider to use.</param>
+    public FormattingStreamWriter(string path, IFormatProvider formatProvider)
+        : base(path)
+    {
+        _formatProvider = formatProvider;
+    }
+
+    /// <inheritdoc />
+    public override IFormatProvider FormatProvider
+        => _formatProvider;
+}
diff --git a/tests/Jellyfin.Extensions.Tests/FormattingStreamWriterTests.cs b/tests/Jellyfin.Extensions.Tests/FormattingStreamWriterTests.cs
new file mode 100644
index 000000000..06e3c2721
--- /dev/null
+++ b/tests/Jellyfin.Extensions.Tests/FormattingStreamWriterTests.cs
@@ -0,0 +1,23 @@
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Threading;
+using Xunit;
+
+namespace Jellyfin.Extensions.Tests;
+
+public static class FormattingStreamWriterTests
+{
+    [Fact]
+    public static void Shuffle_Valid_Correct()
+    {
+        Thread.CurrentThread.CurrentCulture = new CultureInfo("de-DE", false);
+        using (var ms = new MemoryStream())
+        using (var txt = new FormattingStreamWriter(ms, CultureInfo.InvariantCulture))
+        {
+            txt.Write("{0}", 3.14159);
+            txt.Close();
+            Assert.Equal("3.14159", Encoding.UTF8.GetString(ms.ToArray()));
+        }
+    }
+}