diff options
| author | crobibero <cody@robibe.ro> | 2020-08-17 11:54:55 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-08-17 11:54:55 -0600 |
| commit | 10ac32569e94acb48cce3a549700abc94bfa068f (patch) | |
| tree | 99dd0ec58768a1cf6a1504aaaa31a55e9ed83449 | |
| parent | 7a0fa341625215720d4c74149d9d579a50b5ad48 (diff) | |
Remove IHttpClient from ItemImageProvider
| -rw-r--r-- | MediaBrowser.Providers/Manager/ItemImageProvider.cs | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs index 6cc3ca369..47b8554dd 100644 --- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs +++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs @@ -465,9 +465,15 @@ namespace MediaBrowser.Providers.Manager try { - var response = await provider.GetImageResponse(url, cancellationToken).ConfigureAwait(false); + using var response = await provider.GetImageResponse(url, cancellationToken).ConfigureAwait(false); - await _providerManager.SaveImage(item, response.Content, response.ContentType, type, null, cancellationToken).ConfigureAwait(false); + await _providerManager.SaveImage( + item, + await response.Content.ReadAsStreamAsync().ConfigureAwait(false), + response.Content.Headers.ContentType.MediaType, + type, + null, + cancellationToken).ConfigureAwait(false); result.UpdateType = result.UpdateType | ItemUpdateType.ImageUpdate; return true; @@ -565,14 +571,14 @@ namespace MediaBrowser.Providers.Manager try { - var response = await provider.GetImageResponse(url, cancellationToken).ConfigureAwait(false); + using var response = await provider.GetImageResponse(url, cancellationToken).ConfigureAwait(false); // If there's already an image of the same size, skip it - if (response.ContentLength.HasValue) + if (response.Content.Headers.ContentLength.HasValue) { try { - if (item.GetImages(imageType).Any(i => _fileSystem.GetFileInfo(i.Path).Length == response.ContentLength.Value)) + if (item.GetImages(imageType).Any(i => _fileSystem.GetFileInfo(i.Path).Length == response.Content.Headers.ContentLength.Value)) { response.Content.Dispose(); continue; @@ -584,7 +590,13 @@ namespace MediaBrowser.Providers.Manager } } - await _providerManager.SaveImage(item, response.Content, response.ContentType, imageType, null, cancellationToken).ConfigureAwait(false); + await _providerManager.SaveImage( + item, + await response.Content.ReadAsStreamAsync().ConfigureAwait(false), + response.Content.Headers.ContentType.MediaType, + imageType, + null, + cancellationToken).ConfigureAwait(false); result.UpdateType = result.UpdateType | ItemUpdateType.ImageUpdate; } catch (HttpException ex) |
