Convert using statements to using declarations where applicable

MediaBrowser.Api/Images/ImageService.cs

@@ -743,8 +743,7 @@ namespace MediaBrowser.Api.Images
         /// <returns>Task.</returns>
         public async Task PostImage(BaseItem entity, Stream inputStream, ImageType imageType, string mimeType)
         {
-            using (var reader = new StreamReader(inputStream))
+            using var reader = new StreamReader(inputStream);
-            {
             var text = await reader.ReadToEndAsync().ConfigureAwait(false);
 
             var bytes = Convert.FromBase64String(text);
@@ -762,5 +761,4 @@ namespace MediaBrowser.Api.Images
             entity.UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None);
         }
     }
-    }
 }

MediaBrowser.Api/Images/RemoteImageService.cs

@@ -261,28 +261,26 @@ namespace MediaBrowser.Api.Images
         /// <returns>Task.</returns>
         private async Task DownloadImage(string url, Guid urlHash, string pointerCachePath)
         {
-            using (var result = await _httpClient.GetResponse(new HttpRequestOptions
+            using var result = await _httpClient.GetResponse(new HttpRequestOptions
             {
                 Url = url,
                 BufferContent = false
 
-            }).ConfigureAwait(false))
+            }).ConfigureAwait(false);
-            {
             var ext = result.ContentType.Split('/').Last();
 
             var fullCachePath = GetFullCachePath(urlHash + "." + ext);
 
             Directory.CreateDirectory(Path.GetDirectoryName(fullCachePath));
             using (var stream = result.Content)
-                using (var filestream = new FileStream(fullCachePath, FileMode.Create, FileAccess.Write, FileShare.Read, IODefaults.FileStreamBufferSize, true))
             {
+                using var filestream = new FileStream(fullCachePath, FileMode.Create, FileAccess.Write, FileShare.Read, IODefaults.FileStreamBufferSize, true);
                 await stream.CopyToAsync(filestream).ConfigureAwait(false);
             }
 
             Directory.CreateDirectory(Path.GetDirectoryName(pointerCachePath));
             File.WriteAllText(pointerCachePath, fullCachePath);
         }
-        }
 
         /// <summary>
         /// Gets the full cache path.

MediaBrowser.Api/LiveTv/LiveTvService.cs

@@ -885,12 +885,11 @@ namespace MediaBrowser.Api.LiveTv
         {
             // SchedulesDirect requires a SHA1 hash of the user's password
             // https://github.com/SchedulesDirect/JSON-Service/wiki/API-20141201#obtain-a-token
-            using (SHA1 sha = SHA1.Create())
+            using SHA1 sha = SHA1.Create();
-            {
+
             return Hex.Encode(
                 sha.ComputeHash(Encoding.UTF8.GetBytes(str)));
         }
-        }
 
         public void Delete(DeleteListingProvider request)
         {

MediaBrowser.Api/Playback/Hls/BaseHlsService.cs

@@ -168,10 +168,9 @@ namespace MediaBrowser.Api.Playback.Hls
 
         private string GetLivePlaylistText(string path, int segmentLength)
         {
-            using (var stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+            using var stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-            {
+            using var reader = new StreamReader(stream);
-                using (var reader = new StreamReader(stream))
+
-                {
             var text = reader.ReadToEnd();
 
             text = text.Replace("#EXTM3U", "#EXTM3U\n#EXT-X-PLAYLIST-TYPE:EVENT");
@@ -183,8 +182,6 @@ namespace MediaBrowser.Api.Playback.Hls
 
             return text;
         }
-            }
-        }
 
         private string GetMasterPlaylistFileText(string firstPlaylist, int bitrate, int baselineStreamBitrate)
         {
@@ -212,10 +209,8 @@ namespace MediaBrowser.Api.Playback.Hls
                 try
                 {
                     // Need to use FileShare.ReadWrite because we're reading the file at the same time it's being written
-                    using (var fileStream = GetPlaylistFileStream(playlist))
+                    using var fileStream = GetPlaylistFileStream(playlist);
-                    {
+                    using var reader = new StreamReader(fileStream);
-                        using (var reader = new StreamReader(fileStream))
-                        {
                     var count = 0;
 
                     while (!reader.EndOfStream)
@@ -234,8 +229,6 @@ namespace MediaBrowser.Api.Playback.Hls
                     }
                     await Task.Delay(100, cancellationToken).ConfigureAwait(false);
                 }
-                    }
-                }
                 catch (IOException)
                 {
                     // May get an error if the file is locked

MediaBrowser.Api/Subtitles/SubtitleService.cs

@@ -230,18 +230,15 @@ namespace MediaBrowser.Api.Subtitles
 
             if (string.Equals(request.Format, "vtt", StringComparison.OrdinalIgnoreCase) && request.AddVttTimeMap)
             {
-                using (var stream = await GetSubtitles(request).ConfigureAwait(false))
+                using var stream = await GetSubtitles(request).ConfigureAwait(false);
-                {
+                using var reader = new StreamReader(stream);
-                    using (var reader = new StreamReader(stream))
+
-                    {
                 var text = reader.ReadToEnd();
 
                 text = text.Replace("WEBVTT", "WEBVTT\nX-TIMESTAMP-MAP=MPEGTS:900000,LOCAL:00:00:00.000");
 
                 return ResultFactory.GetResult(Request, text, MimeTypes.GetMimeType("file." + request.Format));
             }
-                }
-            }
 
             return ResultFactory.GetResult(Request, await GetSubtitles(request).ConfigureAwait(false), MimeTypes.GetMimeType("file." + request.Format));
         }