From 229917a2f819b9b5d8e59e116503a0dcca35c0a3 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Mon, 4 Oct 2021 21:12:09 +0200
Subject: [PATCH 1/2] Queue refresh after subtitle upload + minor fixes

---
 .../Controllers/SubtitleController.cs         |  2 ++
 .../Subtitles/SubtitleManager.cs              | 24 ++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Jellyfin.Api/Controllers/SubtitleController.cs b/Jellyfin.Api/Controllers/SubtitleController.cs
index 1849dd0478..8fb85c732b 100644
--- a/Jellyfin.Api/Controllers/SubtitleController.cs
+++ b/Jellyfin.Api/Controllers/SubtitleController.cs
@@ -417,6 +417,8 @@ namespace Jellyfin.Api.Controllers
                     IsForced = body.IsForced,
                     Stream = memoryStream
                 }).ConfigureAwait(false);
+            _providerManager.QueueRefresh(video.Id, new MetadataRefreshOptions(new DirectoryService(_fileSystem)), RefreshPriority.High);
+
             return NoContent();
         }
 
diff --git a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
index 772e617abb..8403e16abf 100644
--- a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
+++ b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
@@ -187,8 +187,8 @@ namespace MediaBrowser.Providers.Subtitles
         {
             var saveInMediaFolder = libraryOptions.SaveSubtitlesWithMedia;
 
-            using var stream = response.Stream;
-            using var memoryStream = new MemoryStream();
+            await using var stream = response.Stream;
+            await using var memoryStream = new MemoryStream();
             await stream.CopyToAsync(memoryStream).ConfigureAwait(false);
             memoryStream.Position = 0;
 
@@ -236,7 +236,7 @@ namespace MediaBrowser.Providers.Subtitles
 
             foreach (var savePath in savePaths)
             {
-                _logger.LogInformation("Saving subtitles to {0}", savePath);
+                _logger.LogInformation("Saving subtitles to {SavePath}", savePath);
 
                 _monitor.ReportFileSystemChangeBeginning(savePath);
 
@@ -254,13 +254,19 @@ namespace MediaBrowser.Providers.Subtitles
                 {
 // Bug in analyzer -- https://github.com/dotnet/roslyn-analyzers/issues/5160
 #pragma warning disable CA1508
-                    exs ??= new List<Exception>()
-                            {
-                                ex
-                            };
+                    if (exs == null)
 #pragma warning restore CA1508
-
-            }
+                    {
+                        exs = new List<Exception>
+                        {
+                            ex
+                        };
+                    }
+                    else
+                    {
+                        exs.Add(ex);
+                    }
+                }
                 finally
                 {
                     _monitor.ReportFileSystemChangeComplete(savePath, false);

From 7abdf71c49b271281b5500c3cbbebc7ead06f0e2 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Tue, 5 Oct 2021 19:49:43 +0200
Subject: [PATCH 2/2] Revert to old line

---
 MediaBrowser.Providers/Subtitles/SubtitleManager.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
index 8403e16abf..78ca76e4b7 100644
--- a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
+++ b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
@@ -254,18 +254,8 @@ namespace MediaBrowser.Providers.Subtitles
                 {
 // Bug in analyzer -- https://github.com/dotnet/roslyn-analyzers/issues/5160
 #pragma warning disable CA1508
-                    if (exs == null)
+                    (exs ??= new List<Exception>()).Add(ex);
 #pragma warning restore CA1508
-                    {
-                        exs = new List<Exception>
-                        {
-                            ex
-                        };
-                    }
-                    else
-                    {
-                        exs.Add(ex);
-                    }
                 }
                 finally
                 {