mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-19 12:44:19 +01:00
use named http clients
This commit is contained in:
@@ -1,77 +0,0 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Net.Http;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace MediaBrowser.Common.Net
|
||||
{
|
||||
/// <summary>
|
||||
/// Default http client.
|
||||
/// </summary>
|
||||
public class DefaultHttpClient
|
||||
{
|
||||
private readonly HttpClient _httpClient;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="DefaultHttpClient" /> class.
|
||||
/// </summary>
|
||||
/// <param name="httpClient">Instance of httpclient.</param>
|
||||
public DefaultHttpClient(HttpClient httpClient)
|
||||
{
|
||||
_httpClient = httpClient;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Make GET request.
|
||||
/// </summary>
|
||||
/// <param name="url">Url to request.</param>
|
||||
/// <returns>A <see cref="Task"/> containing the <see cref="HttpResponseMessage"/>.</returns>
|
||||
public Task<HttpResponseMessage> GetAsync(Uri url)
|
||||
{
|
||||
return _httpClient.GetAsync(url);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Make GET request.
|
||||
/// </summary>
|
||||
/// <param name="url">Url to request.</param>
|
||||
/// <param name="cancellationToken">The cancellation token.</param>
|
||||
/// <returns>A <see cref="Task"/> containing the <see cref="HttpResponseMessage"/>.</returns>
|
||||
public Task<HttpResponseMessage> GetAsync(Uri url, CancellationToken cancellationToken)
|
||||
{
|
||||
return _httpClient.GetAsync(url, cancellationToken);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get stream.
|
||||
/// </summary>
|
||||
/// <param name="url">Url to get stream from.</param>
|
||||
/// <returns>A <see cref="Task"/> containing the <see cref="Stream"/>.</returns>
|
||||
public Task<Stream> GetStreamAsync(Uri url)
|
||||
{
|
||||
return _httpClient.GetStreamAsync(url);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Send request.
|
||||
/// </summary>
|
||||
/// <param name="requestMessage">The <see cref="HttpRequestMessage"/>.</param>
|
||||
/// <returns>A <see cref="Task"/> containing the <see cref="HttpResponseMessage"/>.</returns>
|
||||
public Task<HttpResponseMessage> SendAsync(HttpRequestMessage requestMessage)
|
||||
{
|
||||
return _httpClient.SendAsync(requestMessage);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Send request.
|
||||
/// </summary>
|
||||
/// <param name="requestMessage">The <see cref="HttpRequestMessage"/>.</param>
|
||||
/// <param name="cancellationToken">The cancellation token.</param>
|
||||
/// <returns>A <see cref="Task"/> containing the <see cref="HttpResponseMessage"/>.</returns>
|
||||
public Task<HttpResponseMessage> SendAsync(HttpRequestMessage requestMessage, CancellationToken cancellationToken)
|
||||
{
|
||||
return _httpClient.SendAsync(requestMessage, cancellationToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
18
MediaBrowser.Common/Net/NamedClient.cs
Normal file
18
MediaBrowser.Common/Net/NamedClient.cs
Normal file
@@ -0,0 +1,18 @@
|
||||
namespace MediaBrowser.Common.Net
|
||||
{
|
||||
/// <summary>
|
||||
/// Registered http client names.
|
||||
/// </summary>
|
||||
public static class NamedClient
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets the value for the default named http client.
|
||||
/// </summary>
|
||||
public const string Default = nameof(Default);
|
||||
|
||||
/// <summary>
|
||||
/// Gets the value for the MusicBrainz named http client.
|
||||
/// </summary>
|
||||
public const string MusicBrainz = nameof(MusicBrainz);
|
||||
}
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
using System.Net.Http;
|
||||
using System.Net.Http.Headers;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace MediaBrowser.Common.Net
|
||||
{
|
||||
/// <summary>
|
||||
/// User agent delegating handler.
|
||||
/// Adds User-Agent header to all requests.
|
||||
/// </summary>
|
||||
public class UserAgentDelegatingHandler : DelegatingHandler
|
||||
{
|
||||
private readonly ProductInfoHeaderValue[] _userAgentValues;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="UserAgentDelegatingHandler"/> class.
|
||||
/// </summary>
|
||||
/// <param name="applicationHost">Instance of the <see cref="IApplicationHost"/> interface.</param>
|
||||
public UserAgentDelegatingHandler(IApplicationHost applicationHost)
|
||||
{
|
||||
_userAgentValues = new[]
|
||||
{
|
||||
new ProductInfoHeaderValue(applicationHost.Name.Replace(' ', '-'), applicationHost.ApplicationVersionString)
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Send request message.
|
||||
/// </summary>
|
||||
/// <param name="request">The request message.</param>
|
||||
/// <param name="cancellationToken">The cancellation token.</param>
|
||||
/// <returns>A <see cref="Task"/> containing the <see cref="HttpResponseMessage"/>.</returns>
|
||||
protected override Task<HttpResponseMessage> SendAsync(
|
||||
HttpRequestMessage request,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
if (request.Headers.UserAgent.Count == 0)
|
||||
{
|
||||
for (var i = 0; i < _userAgentValues.Length; i++)
|
||||
{
|
||||
request.Headers.UserAgent.Add(_userAgentValues[i]);
|
||||
}
|
||||
}
|
||||
|
||||
return base.SendAsync(request, cancellationToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user