Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5307 from barronpm/using-declarations

Browse Source
This commit is contained in:
Bond-009 2021-05-16 09:58:10 +00:00 committed by GitHub
commit f06f3450c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 158 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Providers/Plugins/MusicBrainz/ArtistProvider.cs
View File

@ -69,8 +69,7 @@ namespace MediaBrowser.Providers.Music
private IEnumerable<RemoteSearchResult> GetResultsFromResponse(Stream stream) private IEnumerable<RemoteSearchResult> GetResultsFromResponse(Stream stream)
{ {
using (var oReader = new StreamReader(stream, Encoding.UTF8)) using var oReader = new StreamReader(stream, Encoding.UTF8);
{
var settings = new XmlReaderSettings() var settings = new XmlReaderSettings()
{ {
ValidationType = ValidationType.None, ValidationType = ValidationType.None,
@ -79,8 +78,7 @@ namespace MediaBrowser.Providers.Music
IgnoreComments = true IgnoreComments = true
}; };
using (var reader = XmlReader.Create(oReader, settings)) using var reader = XmlReader.Create(oReader, settings);
{
reader.MoveToContent(); reader.MoveToContent();
reader.Read(); reader.Read();
@ -99,11 +97,9 @@ namespace MediaBrowser.Providers.Music
continue; continue;
} }
using (var subReader = reader.ReadSubtree()) using var subReader = reader.ReadSubtree();
{
return ParseArtistList(subReader).ToList(); return ParseArtistList(subReader).ToList();
} }
}
default: default:
{ {
@ -120,8 +116,6 @@ namespace MediaBrowser.Providers.Music
return Enumerable.Empty<RemoteSearchResult>(); return Enumerable.Empty<RemoteSearchResult>();
} }
}
}
private IEnumerable<RemoteSearchResult> ParseArtistList(XmlReader reader) private IEnumerable<RemoteSearchResult> ParseArtistList(XmlReader reader)
{ {
@ -145,14 +139,12 @@ namespace MediaBrowser.Providers.Music
var mbzId = reader.GetAttribute("id"); var mbzId = reader.GetAttribute("id");
using (var subReader = reader.ReadSubtree()) using var subReader = reader.ReadSubtree();
{
var artist = ParseArtist(subReader, mbzId); var artist = ParseArtist(subReader, mbzId);
if (artist != null) if (artist != null)
{ {
yield return artist; yield return artist;
} }
}
break; break;
} }

36
MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumProvider.cs
View File

@ -128,8 +128,7 @@ namespace MediaBrowser.Providers.Music
private IEnumerable<RemoteSearchResult> GetResultsFromResponse(Stream stream) private IEnumerable<RemoteSearchResult> GetResultsFromResponse(Stream stream)
{ {
using (var oReader = new StreamReader(stream, Encoding.UTF8)) using var oReader = new StreamReader(stream, Encoding.UTF8);
{
var settings = new XmlReaderSettings() var settings = new XmlReaderSettings()
{ {
ValidationType = ValidationType.None, ValidationType = ValidationType.None,
@ -138,8 +137,7 @@ namespace MediaBrowser.Providers.Music
IgnoreComments = true IgnoreComments = true
}; };
using (var reader = XmlReader.Create(oReader, settings)) using var reader = XmlReader.Create(oReader, settings);
{
var results = ReleaseResult.Parse(reader); var results = ReleaseResult.Parse(reader);
return results.Select(i => return results.Select(i =>
@ -174,8 +172,6 @@ namespace MediaBrowser.Providers.Music
return result; return result;
}); });
} }
}
}
/// <inheritdoc /> /// <inheritdoc />
public async Task<MetadataResult<MusicAlbum>> GetMetadata(AlbumInfo id, CancellationToken cancellationToken) public async Task<MetadataResult<MusicAlbum>> GetMetadata(AlbumInfo id, CancellationToken cancellationToken)
@ -339,11 +335,9 @@ namespace MediaBrowser.Providers.Music
continue; continue;
} }
using (var subReader = reader.ReadSubtree()) using var subReader = reader.ReadSubtree();
{
return ParseReleaseList(subReader).ToList(); return ParseReleaseList(subReader).ToList();
} }
}
default: default:
{ {
@ -383,14 +377,12 @@ namespace MediaBrowser.Providers.Music
var releaseId = reader.GetAttribute("id"); var releaseId = reader.GetAttribute("id");
using (var subReader = reader.ReadSubtree()) using var subReader = reader.ReadSubtree();
{
var release = ParseRelease(subReader, releaseId); var release = ParseRelease(subReader, releaseId);
if (release != null) if (release != null)
{ {
yield return release; yield return release;
} }
}
break; break;
} }
@ -460,15 +452,13 @@ namespace MediaBrowser.Providers.Music
case "artist-credit": case "artist-credit":
{ {
using (var subReader = reader.ReadSubtree()) using var subReader = reader.ReadSubtree();
{
var artist = ParseArtistCredit(subReader); var artist = ParseArtistCredit(subReader);
if (!string.IsNullOrEmpty(artist.Item1)) if (!string.IsNullOrEmpty(artist.Item1))
{ {
result.Artists.Add(artist); result.Artists.Add(artist);
} }
}
break; break;
} }
@ -506,11 +496,9 @@ namespace MediaBrowser.Providers.Music
{ {
case "name-credit": case "name-credit":
{ {
using (var subReader = reader.ReadSubtree()) using var subReader = reader.ReadSubtree();
{
return ParseArtistNameCredit(subReader); return ParseArtistNameCredit(subReader);
} }
}
default: default:
{ {
@ -545,11 +533,9 @@ namespace MediaBrowser.Providers.Music
case "artist": case "artist":
{ {
var id = reader.GetAttribute("id"); var id = reader.GetAttribute("id");
using (var subReader = reader.ReadSubtree()) using var subReader = reader.ReadSubtree();
{
return ParseArtistArtistCredit(subReader, id); return ParseArtistArtistCredit(subReader, id);
} }
}
default: default:
{ {
@ -647,8 +633,7 @@ namespace MediaBrowser.Providers.Music
IgnoreComments = true IgnoreComments = true
}; };
using (var reader = XmlReader.Create(oReader, settings)) using var reader = XmlReader.Create(oReader, settings);
{
reader.MoveToContent(); reader.MoveToContent();
reader.Read(); reader.Read();
@ -667,11 +652,9 @@ namespace MediaBrowser.Providers.Music
continue; continue;
} }
using (var subReader = reader.ReadSubtree()) using var subReader = reader.ReadSubtree();
{
return GetFirstReleaseGroupId(subReader); return GetFirstReleaseGroupId(subReader);
} }
}
default: default:
{ {
@ -688,7 +671,6 @@ namespace MediaBrowser.Providers.Music
return null; return null;
} }
}
private string GetFirstReleaseGroupId(XmlReader reader) private string GetFirstReleaseGroupId(XmlReader reader)
{ {

8
MediaBrowser.Providers/Studios/StudiosImageProvider.cs
View File

@ -172,10 +172,8 @@ namespace MediaBrowser.Providers.Studios
public IEnumerable<string> GetAvailableImages(string file) public IEnumerable<string> GetAvailableImages(string file)
{ {
using (var fileStream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read)) using var fileStream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read);
{ using var reader = new StreamReader(fileStream);
using (var reader = new StreamReader(fileStream))
{
var lines = new List<string>(); var lines = new List<string>();
foreach (var line in reader.ReadAllLines()) foreach (var line in reader.ReadAllLines())
@ -189,6 +187,4 @@ namespace MediaBrowser.Providers.Studios
return lines; return lines;
} }
} }
}
}
} }

10
MediaBrowser.Providers/Subtitles/SubtitleManager.cs
View File

@ -187,9 +187,8 @@ namespace MediaBrowser.Providers.Subtitles
{ {
var saveInMediaFolder = libraryOptions.SaveSubtitlesWithMedia; var saveInMediaFolder = libraryOptions.SaveSubtitlesWithMedia;
using (var stream = response.Stream) using var stream = response.Stream;
using (var memoryStream = new MemoryStream()) using var memoryStream = new MemoryStream();
{
await stream.CopyToAsync(memoryStream).ConfigureAwait(false); await stream.CopyToAsync(memoryStream).ConfigureAwait(false);
memoryStream.Position = 0; memoryStream.Position = 0;
@ -230,7 +229,6 @@ namespace MediaBrowser.Providers.Subtitles
_logger.LogError("An uploaded subtitle could not be saved because the resulting paths were invalid."); _logger.LogError("An uploaded subtitle could not be saved because the resulting paths were invalid.");
} }
} }
}
private async Task TrySaveToFiles(Stream stream, List<string> savePaths) private async Task TrySaveToFiles(Stream stream, List<string> savePaths)
{ {
@ -247,10 +245,8 @@ namespace MediaBrowser.Providers.Subtitles
Directory.CreateDirectory(Path.GetDirectoryName(savePath)); Directory.CreateDirectory(Path.GetDirectoryName(savePath));
// use FileShare.None as this bypasses dotnet bug dotnet/runtime#42790 . // use FileShare.None as this bypasses dotnet bug dotnet/runtime#42790 .
using (var fs = new FileStream(savePath, FileMode.Create, FileAccess.Write, FileShare.None, FileStreamBufferSize, true)) using var fs = new FileStream(savePath, FileMode.Create, FileAccess.Write, FileShare.None, FileStreamBufferSize, true);
{
await stream.CopyToAsync(fs).ConfigureAwait(false); await stream.CopyToAsync(fs).ConfigureAwait(false);
}
return; return;
} }