From 13fbfe6091e61450aedc07bc78c96bf4c414bc65 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sun, 14 Feb 2021 15:11:46 +0100
Subject: Target net6.0

---
 MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj | 2 +-
 MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
index 5deaecc95..30cfb904e 100644
--- a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
+++ b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs
index 3d864e29c..20e4be780 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs
@@ -38,7 +38,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             subRip.LoadSubtitle(subtitle, lines, "untitled");
             if (subRip.ErrorCount > 0)
             {
-                _logger.LogError("{ErrorCount} errors encountered while parsing subtitle.");
+                _logger.LogError("{ErrorCount} errors encountered while parsing subtitle.", subRip.ErrorCount);
             }
 
             var trackInfo = new SubtitleTrackInfo();
-- 
cgit v1.2.3


From 4643fd5dcbc6d1a4fbe973efc68d92ca71e3ab3b Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sat, 25 Sep 2021 18:15:46 +0200
Subject: Address comments

---
 Jellyfin.Server/Middleware/UrlDecodeQueryFeature.cs            | 10 +++++++---
 MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs     |  2 +-
 .../EncodedQueryStringTest.cs                                  |  1 +
 tests/Jellyfin.Server.Tests/UrlDecodeQueryFeatureTests.cs      |  3 ---
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/Jellyfin.Server/Middleware/UrlDecodeQueryFeature.cs b/Jellyfin.Server/Middleware/UrlDecodeQueryFeature.cs
index 35959ee32..b5f515cda 100644
--- a/Jellyfin.Server/Middleware/UrlDecodeQueryFeature.cs
+++ b/Jellyfin.Server/Middleware/UrlDecodeQueryFeature.cs
@@ -52,10 +52,14 @@ namespace Jellyfin.Server.Middleware
                     return;
                 }
 
-                var pairs = new Dictionary<string, StringValues>();
-                var queryString = HttpUtility.UrlDecode(key).SpanSplit('&');
+                if (!key.Contains('='))
+                {
+                    _store = value;
+                    return;
+                }
 
-                foreach (var pair in queryString)
+                var pairs = new Dictionary<string, StringValues>();
+                foreach (var pair in key.SpanSplit('&'))
                 {
                     var i = pair.IndexOf('=');
                     if (i == -1)
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs
index 20e4be780..52c1b6467 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs
@@ -38,7 +38,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             subRip.LoadSubtitle(subtitle, lines, "untitled");
             if (subRip.ErrorCount > 0)
             {
-                _logger.LogError("{ErrorCount} errors encountered while parsing subtitle.", subRip.ErrorCount);
+                _logger.LogError("{ErrorCount} errors encountered while parsing subtitle", subRip.ErrorCount);
             }
 
             var trackInfo = new SubtitleTrackInfo();
diff --git a/tests/Jellyfin.Server.Integration.Tests/EncodedQueryStringTest.cs b/tests/Jellyfin.Server.Integration.Tests/EncodedQueryStringTest.cs
index 732b4f050..2361e4aa4 100644
--- a/tests/Jellyfin.Server.Integration.Tests/EncodedQueryStringTest.cs
+++ b/tests/Jellyfin.Server.Integration.Tests/EncodedQueryStringTest.cs
@@ -21,6 +21,7 @@ namespace Jellyfin.Server.Integration.Tests
         [InlineData("a=1", "a=1")] // won't be processed as it has a value
         [InlineData("a%3D1%26b%3D2%26c%3D3", "a=1&b=2&c=3")] // will be processed.
         [InlineData("a=b&a=c", "a=b")]
+        [InlineData("a%3D1", "a=1")]
         [InlineData("a%3Db%26a%3Dc", "a=b")]
         public async Task Ensure_Decoding_Of_Urls_Is_Working(string sourceUrl, string unencodedUrl)
         {
diff --git a/tests/Jellyfin.Server.Tests/UrlDecodeQueryFeatureTests.cs b/tests/Jellyfin.Server.Tests/UrlDecodeQueryFeatureTests.cs
index 419afb2dc..d15c9d6f5 100644
--- a/tests/Jellyfin.Server.Tests/UrlDecodeQueryFeatureTests.cs
+++ b/tests/Jellyfin.Server.Tests/UrlDecodeQueryFeatureTests.cs
@@ -12,9 +12,6 @@ namespace Jellyfin.Server.Tests
     {
         [Theory]
         [InlineData("e0a72cb2a2c7", "e0a72cb2a2c7")] // isn't encoded
-        [InlineData("random+test", "random test")] // encoded
-        [InlineData("random%20test", "random test")] // encoded
-        [InlineData("++", "  ")] // encoded
         public static void EmptyValueTest(string query, string key)
         {
             var dict = new Dictionary<string, StringValues>
-- 
cgit v1.2.3