tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-24 22:35:39 -04:00
Code Issues Projects Releases Wiki Activity

Replaced Uri with HttpUri.

Browse Source
This commit is contained in:
Taloth Saldono
2016-03-01 00:33:28 +01:00
parent 7c54fa70d7
commit 23871503a2
29 changed files with 356 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Common/Http/HttpRequestBuilder.cs
+9 -14
View File
@@ -12,7 +12,7 @@ namespace NzbDrone.Common.Http
{
public HttpMethod Method { get; set; }
public HttpAccept HttpAccept { get; set; }
public Uri BaseUrl { get; private set; }
public HttpUri BaseUrl { get; private set; }
public string ResourceUrl { get; set; }
public List<KeyValuePair<string, string>> QueryParams { get; private set; }
public List<KeyValuePair<string, string>> SuffixQueryParams { get; private set; }
@@ -28,7 +28,7 @@ namespace NzbDrone.Common.Http
public HttpRequestBuilder(string baseUrl)
{
BaseUrl = new Uri(baseUrl);
BaseUrl = new HttpUri(baseUrl);
ResourceUrl = string.Empty;
Method = HttpMethod.GET;
QueryParams = new List<KeyValuePair<string, string>>();
@@ -69,33 +69,28 @@ namespace NzbDrone.Common.Http
return clone;
}
protected virtual Uri CreateUri()
protected virtual HttpUri CreateUri()
{
var builder = new UriBuilder(new Uri(BaseUrl, ResourceUrl));
var url = BaseUrl.CombinePath(ResourceUrl).AddQueryParams(QueryParams.Concat(SuffixQueryParams));
foreach (var queryParam in QueryParams.Concat(SuffixQueryParams))
{
builder.SetQueryParam(queryParam.Key, queryParam.Value);
}
if (Segments.Any())
{
var url = builder.Uri.ToString();
var fullUri = url.FullUri;
foreach (var segment in Segments)
{
url = url.Replace(segment.Key, segment.Value);
fullUri = fullUri.Replace(segment.Key, segment.Value);
}
builder = new UriBuilder(url);
url = new HttpUri(fullUri);
}
return builder.Uri;
return url;
}
protected virtual HttpRequest CreateRequest()
{
return new HttpRequest(CreateUri().ToString(), HttpAccept);
return new HttpRequest(CreateUri().FullUri, HttpAccept);
}
protected virtual void Apply(HttpRequest request)