Fix more warnings

1 files changed, 39 insertions, 36 deletions

diff --git a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
index b4a4c36e5..c6199399d 100644
--- a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
+++ b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
@@ -19,6 +19,7 @@ using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Providers;
 using Microsoft.Extensions.Logging;
+using static MediaBrowser.Model.IO.StreamDefaults;
 
 namespace MediaBrowser.Providers.Subtitles
 {
@@ -30,8 +31,6 @@ namespace MediaBrowser.Providers.Subtitles
         private readonly ILibraryMonitor _monitor;
         private readonly IMediaSourceManager _mediaSourceManager;
 
-        public event EventHandler<SubtitleDownloadFailureEventArgs> SubtitleDownloadFailure;
-
         private ILocalizationManager _localization;
 
         public SubtitleManager(
@@ -48,17 +47,18 @@ namespace MediaBrowser.Providers.Subtitles
             _localization = localizationManager;
         }
 
+        /// <inheritdoc />
+        public event EventHandler<SubtitleDownloadFailureEventArgs> SubtitleDownloadFailure;
+
+        /// <inheritdoc />
         public void AddParts(IEnumerable<ISubtitleProvider> subtitleProviders)
         {
             _subtitleProviders = subtitleProviders
-                .OrderBy(i =>
-                {
-                    var hasOrder = i as IHasOrder;
-                    return hasOrder == null ? 0 : hasOrder.Order;
-                })
+                .OrderBy(i => !(i is IHasOrder hasOrder) ? 0 : hasOrder.Order)
                 .ToArray();
         }
 
+        /// <inheritdoc />
         public async Task<RemoteSubtitleInfo[]> SearchSubtitles(SubtitleSearchRequest request, CancellationToken cancellationToken)
         {
             if (request.Language != null)
@@ -104,7 +104,7 @@ namespace MediaBrowser.Providers.Subtitles
                         _logger.LogError(ex, "Error downloading subtitles from {Provider}", provider.Name);
                     }
                 }
-                return new RemoteSubtitleInfo[] { };
+                return Array.Empty<RemoteSubtitleInfo>();
             }
 
             var tasks = providers.Select(async i =>
@@ -120,7 +120,7 @@ namespace MediaBrowser.Providers.Subtitles
                 catch (Exception ex)
                 {
                     _logger.LogError(ex, "Error downloading subtitles from {0}", i.Name);
-                    return new RemoteSubtitleInfo[] { };
+                    return Array.Empty<RemoteSubtitleInfo>();
                 }
             });
 
@@ -129,6 +129,7 @@ namespace MediaBrowser.Providers.Subtitles
             return results.SelectMany(i => i).ToArray();
         }
 
+        /// <inheritdoc />
         public Task DownloadSubtitles(Video video, string subtitleId, CancellationToken cancellationToken)
         {
             var libraryOptions = BaseItem.LibraryManager.GetLibraryOptions(video);
@@ -136,7 +137,9 @@ namespace MediaBrowser.Providers.Subtitles
             return DownloadSubtitles(video, libraryOptions, subtitleId, cancellationToken);
         }
 
-        public async Task DownloadSubtitles(Video video,
+        /// <inheritdoc />
+        public async Task DownloadSubtitles(
+            Video video,
             LibraryOptions libraryOptions,
             string subtitleId,
             CancellationToken cancellationToken)
@@ -151,31 +154,29 @@ namespace MediaBrowser.Providers.Subtitles
                 var response = await GetRemoteSubtitles(subtitleId, cancellationToken).ConfigureAwait(false);
 
                 using (var stream = response.Stream)
+                using (var memoryStream = new MemoryStream())
                 {
-                    using (var memoryStream = new MemoryStream())
-                    {
-                        await stream.CopyToAsync(memoryStream).ConfigureAwait(false);
-                        memoryStream.Position = 0;
+                    await stream.CopyToAsync(memoryStream).ConfigureAwait(false);
+                    memoryStream.Position = 0;
 
-                        var savePaths = new List<string>();
-                        var saveFileName = Path.GetFileNameWithoutExtension(video.Path) + "." + response.Language.ToLowerInvariant();
+                    var savePaths = new List<string>();
+                    var saveFileName = Path.GetFileNameWithoutExtension(video.Path) + "." + response.Language.ToLowerInvariant();
 
-                        if (response.IsForced)
-                        {
-                            saveFileName += ".forced";
-                        }
+                    if (response.IsForced)
+                    {
+                        saveFileName += ".forced";
+                    }
 
-                        saveFileName += "." + response.Format.ToLowerInvariant();
+                    saveFileName += "." + response.Format.ToLowerInvariant();
 
-                        if (saveInMediaFolder)
-                        {
-                            savePaths.Add(Path.Combine(video.ContainingFolderPath, saveFileName));
-                        }
+                    if (saveInMediaFolder)
+                    {
+                        savePaths.Add(Path.Combine(video.ContainingFolderPath, saveFileName));
+                    }
 
-                        savePaths.Add(Path.Combine(video.GetInternalMetadataPath(), saveFileName));
+                    savePaths.Add(Path.Combine(video.GetInternalMetadataPath(), saveFileName));
 
-                        await TrySaveToFiles(memoryStream, savePaths).ConfigureAwait(false);
-                    }
+                    await TrySaveToFiles(memoryStream, savePaths).ConfigureAwait(false);
                 }
             }
             catch (RateLimitExceededException)
@@ -209,7 +210,7 @@ namespace MediaBrowser.Providers.Subtitles
                 {
                     Directory.CreateDirectory(Path.GetDirectoryName(savePath));
 
-                    using (var fs = _fileSystem.GetFileStream(savePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
+                    using (var fs = new FileStream(savePath, FileMode.Create, FileAccess.Write, FileShare.Read, DefaultFileStreamBufferSize, true))
                     {
                         await stream.CopyToAsync(fs).ConfigureAwait(false);
                     }
@@ -237,11 +238,12 @@ namespace MediaBrowser.Providers.Subtitles
             }
         }
 
+        /// <inheritdoc />
         public Task<RemoteSubtitleInfo[]> SearchSubtitles(Video video, string language, bool? isPerfectMatch, CancellationToken cancellationToken)
         {
             if (video.VideoType != VideoType.VideoFile)
             {
-                return Task.FromResult(new RemoteSubtitleInfo[] { });
+                return Task.FromResult(Array.Empty<RemoteSubtitleInfo>());
             }
 
             VideoContentType mediaType;
@@ -257,7 +259,7 @@ namespace MediaBrowser.Providers.Subtitles
             else
             {
                 // These are the only supported types
-                return Task.FromResult(new RemoteSubtitleInfo[] { });
+                return Task.FromResult(Array.Empty<RemoteSubtitleInfo>());
             }
 
             var request = new SubtitleSearchRequest
@@ -274,9 +276,7 @@ namespace MediaBrowser.Providers.Subtitles
                 IsPerfectMatch = isPerfectMatch ?? false
             };
 
-            var episode = video as Episode;
-
-            if (episode != null)
+            if (video is Episode episode)
             {
                 request.IndexNumberEnd = episode.IndexNumberEnd;
                 request.SeriesName = episode.SeriesName;
@@ -303,6 +303,7 @@ namespace MediaBrowser.Providers.Subtitles
             return _subtitleProviders.First(i => string.Equals(id, GetProviderId(i.Name)));
         }
 
+        /// <inheritdoc />
         public Task DeleteSubtitles(BaseItem item, int index)
         {
             var stream = _mediaSourceManager.GetMediaStreams(new MediaStreamQuery
@@ -328,16 +329,18 @@ namespace MediaBrowser.Providers.Subtitles
             return item.RefreshMetadata(CancellationToken.None);
         }
 
+        /// <inheritdoc />
         public Task<SubtitleResponse> GetRemoteSubtitles(string id, CancellationToken cancellationToken)
         {
             var parts = id.Split(new[] { '_' }, 2);
 
-            var provider = GetProvider(parts.First());
+            var provider = GetProvider(parts[0]);
             id = parts.Last();
 
             return provider.GetSubtitles(id, cancellationToken);
         }
 
+        /// <inheritdoc />
         public SubtitleProviderInfo[] GetSupportedProviders(BaseItem video)
         {
             VideoContentType mediaType;
@@ -353,7 +356,7 @@ namespace MediaBrowser.Providers.Subtitles
             else
             {
                 // These are the only supported types
-                return new SubtitleProviderInfo[] { };
+                return Array.Empty<SubtitleProviderInfo>();
             }
 
             return _subtitleProviders