michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactored GetMemoryStream to use Get

Browse Source
This commit is contained in:
Luke Pulverenti 2013-04-20 15:33:20 -04:00
parent b88f990b82
commit 9c1e771af5
1 changed files with 4 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs
View File

@ -363,68 +363,25 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
var message = new HttpRequestMessage(HttpMethod.Get, url); _logger.Info("HttpClientManager.GetMemoryStream url: {0}", url);
if (resourcePool != null)
{
await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
}
var ms = new MemoryStream(); var ms = new MemoryStream();
_logger.Info("HttpClientManager.GetMemoryStream url: {0}", url);
try try
{ {
cancellationToken.ThrowIfCancellationRequested(); using (var stream = await Get(url, resourcePool, cancellationToken).ConfigureAwait(false))
using (var response = await GetHttpClient(GetHostFromUrl(url)).SendAsync(message, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false))
{ {
EnsureSuccessStatusCode(response); await stream.CopyToAsync(ms, StreamDefaults.DefaultCopyToBufferSize, cancellationToken).ConfigureAwait(false);
cancellationToken.ThrowIfCancellationRequested();
using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
{
await stream.CopyToAsync(ms, StreamDefaults.DefaultCopyToBufferSize, cancellationToken).ConfigureAwait(false);
}
cancellationToken.ThrowIfCancellationRequested();
} }
ms.Position = 0;
return ms; return ms;
} }
catch (OperationCanceledException ex) catch
{ {
ms.Dispose(); ms.Dispose();
throw GetCancellationException(url, cancellationToken, ex);
}
catch (HttpRequestException ex)
{
_logger.ErrorException("Error getting response from " + url, ex);
ms.Dispose();
throw new HttpException(ex.Message, ex);
}
catch (Exception ex)
{
_logger.ErrorException("Error getting response from " + url, ex);
ms.Dispose();
throw; throw;
} }
finally
{
if (resourcePool != null)
{
resourcePool.Release();
}
}
} }
/// <summary> /// <summary>