diff options
| author | Anthony Lavado <anthony@lavado.ca> | 2020-08-18 14:12:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 14:12:28 -0400 |
| commit | 93fe595e5e9863874c1973e4f2d7f3c85549d3f9 (patch) | |
| tree | 1b85a93b1628a7c8379318e28bf79faa01d36540 /Jellyfin.Api/Controllers | |
| parent | 684d9856b11e4795798cd08f84ac4e84e50fa17c (diff) | |
| parent | be67528958fc225d9af17cc34da87a613fb07cc9 (diff) | |
Merge pull request #3925 from crobibero/httpclient
Remove IHttpClient from Providers
Diffstat (limited to 'Jellyfin.Api/Controllers')
| -rw-r--r-- | Jellyfin.Api/Controllers/ItemLookupController.cs | 6 | ||||
| -rw-r--r-- | Jellyfin.Api/Controllers/LiveTvController.cs | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Jellyfin.Api/Controllers/ItemLookupController.cs b/Jellyfin.Api/Controllers/ItemLookupController.cs index c9ad15bab..afde4a433 100644 --- a/Jellyfin.Api/Controllers/ItemLookupController.cs +++ b/Jellyfin.Api/Controllers/ItemLookupController.cs @@ -331,12 +331,12 @@ namespace Jellyfin.Api.Controllers /// <returns>Task.</returns> private async Task DownloadImage(string providerName, string url, Guid urlHash, string pointerCachePath) { - var result = await _providerManager.GetSearchImage(providerName, url, CancellationToken.None).ConfigureAwait(false); - var ext = result.ContentType.Split('/').Last(); + using var result = await _providerManager.GetSearchImage(providerName, url, CancellationToken.None).ConfigureAwait(false); + var ext = result.Content.Headers.ContentType.MediaType.Split('/')[^1]; var fullCachePath = GetFullCachePath(urlHash + "." + ext); Directory.CreateDirectory(Path.GetDirectoryName(fullCachePath)); - await using (var stream = result.Content) + using (var stream = result.Content) { await using var fileStream = new FileStream( fullCachePath, diff --git a/Jellyfin.Api/Controllers/LiveTvController.cs b/Jellyfin.Api/Controllers/LiveTvController.cs index 9d8ec9f75..97a88bc14 100644 --- a/Jellyfin.Api/Controllers/LiveTvController.cs +++ b/Jellyfin.Api/Controllers/LiveTvController.cs @@ -1071,7 +1071,8 @@ namespace Jellyfin.Api.Controllers { var client = _httpClientFactory.CreateClient(); // https://json.schedulesdirect.org/20141201/available/countries - using var response = await client.GetAsync("https://json.schedulesdirect.org/20141201/available/countries") + // Can't dispose the response as it's required up the call chain. + var response = await client.GetAsync("https://json.schedulesdirect.org/20141201/available/countries") .ConfigureAwait(false); return File(await response.Content.ReadAsStreamAsync().ConfigureAwait(false), MediaTypeNames.Application.Json); |
