Backup_Repos/Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr synced 2026-04-11 15:33:23 +02:00
Code Issues Projects Releases Wiki Activity

Use native HttpMethod

Browse source
This commit is contained in:
Qstick 2022-01-03 00:28:20 -06:00
parent e04133d34a
commit 76b6b0dead
56 changed files with 198 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/NzbDrone.Common/Http/HttpClient.cs
View file

@ -3,6 +3,7 @@
using System.Diagnostics;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using NLog;
using NzbDrone.Common.Cache;
@ -87,7 +88,7 @@ public virtual async Task<HttpResponse> ExecuteAsync(HttpRequest request)
// 302 or 303 should default to GET on redirect even if POST on original
if (response.StatusCode == HttpStatusCode.Redirect || response.StatusCode == HttpStatusCode.RedirectMethod)
{
request.Method = HttpMethod.GET;
request.Method = HttpMethod.Get;
request.ContentData = null;
}
@ -263,7 +264,7 @@ public void DownloadFile(string url, string fileName)
public Task<HttpResponse> GetAsync(HttpRequest request)
{
request.Method = HttpMethod.GET;
request.Method = HttpMethod.Get;
return ExecuteAsync(request);
}
@ -288,7 +289,7 @@ public HttpResponse<T> Get<T>(HttpRequest request)
public Task<HttpResponse> HeadAsync(HttpRequest request)
{
request.Method = HttpMethod.HEAD;
request.Method = HttpMethod.Head;
return ExecuteAsync(request);
}
@ -299,7 +300,7 @@ public HttpResponse Head(HttpRequest request)
public Task<HttpResponse> PostAsync(HttpRequest request)
{
request.Method = HttpMethod.POST;
request.Method = HttpMethod.Post;
return ExecuteAsync(request);
}

14
src/NzbDrone.Common/Http/HttpMethod.cs
View file

@ -1,14 +0,0 @@
namespace NzbDrone.Common.Http
{
public enum HttpMethod
{
GET,
POST,
PUT,
DELETE,
HEAD,
OPTIONS,
PATCH,
MERGE
}
}

1
src/NzbDrone.Common/Http/HttpRequest.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using System.Text;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Extensions;

9
src/NzbDrone.Common/Http/HttpRequestBuilder.cs
View file

@ -3,6 +3,7 @@
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using NzbDrone.Common.Extensions;
@ -37,7 +38,7 @@ public HttpRequestBuilder(string baseUrl)
{
BaseUrl = new HttpUri(baseUrl);
ResourceUrl = string.Empty;
Method = HttpMethod.GET;
Method = HttpMethod.Get;
Encoding = Encoding.UTF8;
QueryParams = new List<KeyValuePair<string, string>>();
SuffixQueryParams = new List<KeyValuePair<string, string>>();
@ -275,7 +276,7 @@ public virtual HttpRequestBuilder WithRateLimit(double seconds)
public virtual HttpRequestBuilder Post()
{
Method = HttpMethod.POST;
Method = HttpMethod.Post;
return this;
}
@ -397,7 +398,7 @@ public virtual HttpRequestBuilder StoreResponseCookies(bool val = true)
public virtual HttpRequestBuilder AddFormParameter(string key, object value)
{
if (Method != HttpMethod.POST)
if (Method != HttpMethod.Post)
{
throw new NotSupportedException("HttpRequest Method must be POST to add FormParameter.");
}
@ -413,7 +414,7 @@ public virtual HttpRequestBuilder AddFormParameter(string key, object value)
public virtual HttpRequestBuilder AddFormUpload(string name, string fileName, byte[] data, string contentType = "application/octet-stream")
{
if (Method != HttpMethod.POST)
if (Method != HttpMethod.Post)
{
throw new NotSupportedException("HttpRequest Method must be POST to add FormUpload.");
}

7
src/NzbDrone.Common/Http/JsonRpcRequestBuilder.cs
View file

@ -1,6 +1,7 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using Newtonsoft.Json;
using NzbDrone.Common.Serializer;
@ -17,14 +18,14 @@ public class JsonRpcRequestBuilder : HttpRequestBuilder
public JsonRpcRequestBuilder(string baseUrl)
: base(baseUrl)
{
Method = HttpMethod.POST;
Method = HttpMethod.Post;
JsonParameters = new List<object>();
}
public JsonRpcRequestBuilder(string baseUrl, string method, IEnumerable<object> parameters)
: base(baseUrl)
{
Method = HttpMethod.POST;
Method = HttpMethod.Post;
JsonMethod = method;
JsonParameters = parameters.ToList();
}

3
src/NzbDrone.Core.Test/IndexerTests/AvistazTests/AvistazFixture.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using FluentAssertions;
using Moq;
@ -34,7 +35,7 @@ public async Task should_parse_recent_feed_from_AvistaZ()
var recentFeed = ReadAllText(@"Files/Indexers/Avistaz/recentfeed.json");
Mocker.GetMock<IIndexerHttpClient>()
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
.Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader { { "Content-Type", "application/json" } }, new CookieCollection(), recentFeed)));
var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases;

3
src/NzbDrone.Core.Test/IndexerTests/AvistazTests/PrivateHDFixture.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using FluentAssertions;
using Moq;
@ -34,7 +35,7 @@ public async Task should_parse_recent_feed_from_PrivateHD()
var recentFeed = ReadAllText(@"Files/Indexers/PrivateHD/recentfeed.json");
Mocker.GetMock<IIndexerHttpClient>()
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
.Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader { { "Content-Type", "application/json" } }, new CookieCollection(), recentFeed)));
var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases;

3
src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using FluentAssertions;
using Moq;
@ -33,7 +34,7 @@ public async Task should_parse_recent_feed_from_FileList()
var recentFeed = ReadAllText(@"Files/Indexers/FileList/recentfeed.json");
Mocker.GetMock<IIndexerHttpClient>()
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
.Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed)));
var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases;

3
src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsFixture.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using FluentAssertions;
@ -45,7 +46,7 @@ public async Task should_parse_recent_feed_from_HDBits(string fileName)
var responseJson = ReadAllText(fileName);
Mocker.GetMock<IIndexerHttpClient>()
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.POST), Subject.Definition))
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Post), Subject.Definition))
.Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), responseJson)));
var torrents = (await Subject.Fetch(_movieSearchCriteria)).Releases;

3
src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using FluentAssertions;
using Moq;
@ -43,7 +44,7 @@ public async Task should_parse_recent_feed_from_newznab_nzb_su()
var recentFeed = ReadAllText(@"Files/Indexers/Newznab/newznab_nzb_su.xml");
Mocker.GetMock<IIndexerHttpClient>()
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
.Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed)));
var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 }, Limit = 100, Offset = 0 })).Releases;

5
src/NzbDrone.Core.Test/IndexerTests/PTPTests/PTPFixture.cs
View file

@ -1,5 +1,6 @@
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using FluentAssertions;
using Moq;
@ -37,11 +38,11 @@ public async Task should_parse_feed_from_PTP(string fileName)
var responseJson = ReadAllText(fileName);
Mocker.GetMock<IIndexerHttpClient>()
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.POST), Subject.Definition))
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Post), Subject.Definition))
.Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), authStream.ToString())));
Mocker.GetMock<IIndexerHttpClient>()
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
.Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader { ContentType = HttpAccept.Json.Value }, new CookieCollection(), responseJson)));
var torrents = (await Subject.Fetch(new MovieSearchCriteria())).Releases;

7
src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using FluentAssertions;
using Moq;
@ -39,7 +40,7 @@ public async Task should_parse_recent_feed_from_Rarbg()
var recentFeed = ReadAllText(@"Files/Indexers/Rarbg/RecentFeed_v2.json");
Mocker.GetMock<IIndexerHttpClient>()
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
.Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed)));
var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases;
@ -66,7 +67,7 @@ public async Task should_parse_recent_feed_from_Rarbg()
public async Task should_parse_error_20_as_empty_results()
{
Mocker.GetMock<IIndexerHttpClient>()
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
.Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), "{ error_code: 20, error: \"some message\" }")));
var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases;
@ -78,7 +79,7 @@ public async Task should_parse_error_20_as_empty_results()
public async Task should_warn_on_unknown_error()
{
Mocker.GetMock<IIndexerHttpClient>()
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
.Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), "{ error_code: 25, error: \"some message\" }")));
var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases;

7
src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using FluentAssertions;
using Moq;
@ -44,7 +45,7 @@ public async Task should_parse_recent_feed_from_torznab_hdaccess_net()
var recentFeed = ReadAllText(@"Files/Indexers/Torznab/torznab_hdaccess_net.xml");
Mocker.GetMock<IIndexerHttpClient>()
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
.Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed)));
var releases = (await Subject.Fetch(new MovieSearchCriteria())).Releases;
@ -73,7 +74,7 @@ public async Task should_parse_recent_feed_from_torznab_tpb()
var recentFeed = ReadAllText(@"Files/Indexers/Torznab/torznab_tpb.xml");
Mocker.GetMock<IIndexerHttpClient>()
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
.Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed)));
var releases = (await Subject.Fetch(new MovieSearchCriteria())).Releases;
@ -103,7 +104,7 @@ public async Task should_parse_recent_feed_from_torznab_animetosho()
var recentFeed = ReadAllText(@"Files/Indexers/Torznab/torznab_animetosho.xml");
Mocker.GetMock<IIndexerHttpClient>()
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
.Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
.Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed)));
var releases = (await Subject.Fetch(new MovieSearchCriteria())).Releases;

11
src/NzbDrone.Core/Applications/LazyLibrarian/LazyLibrarianV1Proxy.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using FluentValidation.Results;
using Newtonsoft.Json;
using NLog;
@ -31,13 +32,13 @@ public LazyLibrarianV1Proxy(IHttpClient httpClient, Logger logger)
public LazyLibrarianStatus GetStatus(LazyLibrarianSettings settings)
{
var request = BuildRequest(settings, "/api", "getVersion", HttpMethod.GET);
var request = BuildRequest(settings, "/api", "getVersion", HttpMethod.Get);
return Execute<LazyLibrarianStatus>(request);
}
public List<LazyLibrarianIndexer> GetIndexers(LazyLibrarianSettings settings)
{
var request = BuildRequest(settings, "/api", "listNabProviders", HttpMethod.GET);
var request = BuildRequest(settings, "/api", "listNabProviders", HttpMethod.Get);
var response = Execute<LazyLibrarianIndexerResponse>(request);
@ -76,7 +77,7 @@ public void RemoveIndexer(string indexerName, LazyLibrarianProviderType indexerT
{ "providertype", indexerType.ToString().ToLower() }
};
var request = BuildRequest(settings, "/api", "delProvider", HttpMethod.GET, parameters);
var request = BuildRequest(settings, "/api", "delProvider", HttpMethod.Get, parameters);
CheckForError(Execute<LazyLibrarianStatus>(request));
}
@ -92,7 +93,7 @@ public LazyLibrarianIndexer AddIndexer(LazyLibrarianIndexer indexer, LazyLibrari
{ "categories", indexer.Categories }
};
var request = BuildRequest(settings, "/api", "addProvider", HttpMethod.GET, parameters);
var request = BuildRequest(settings, "/api", "addProvider", HttpMethod.Get, parameters);
CheckForError(Execute<LazyLibrarianStatus>(request));
return indexer;
}
@ -110,7 +111,7 @@ public LazyLibrarianIndexer UpdateIndexer(LazyLibrarianIndexer indexer, LazyLibr
{ "altername", indexer.Altername }
};
var request = BuildRequest(settings, "/api", "changeProvider", HttpMethod.GET, parameters);
var request = BuildRequest(settings, "/api", "changeProvider", HttpMethod.Get, parameters);
CheckForError(Execute<LazyLibrarianStatus>(request));
return indexer;
}

17
src/NzbDrone.Core/Applications/Lidarr/LidarrV1Proxy.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using FluentValidation.Results;
using Newtonsoft.Json;
using NLog;
@ -33,13 +34,13 @@ public LidarrV1Proxy(IHttpClient httpClient, Logger logger)
public LidarrStatus GetStatus(LidarrSettings settings)
{
var request = BuildRequest(settings, "/api/v1/system/status", HttpMethod.GET);
var request = BuildRequest(settings, "/api/v1/system/status", HttpMethod.Get);
return Execute<LidarrStatus>(request);
}
public List<LidarrIndexer> GetIndexers(LidarrSettings settings)
{
var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.GET);
var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.Get);
return Execute<List<LidarrIndexer>>(request);
}
@ -47,7 +48,7 @@ public LidarrIndexer GetIndexer(int indexerId, LidarrSettings settings)
{
try
{
var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.GET);
var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.Get);
return Execute<LidarrIndexer>(request);
}
catch (HttpException ex)
@ -63,19 +64,19 @@ public LidarrIndexer GetIndexer(int indexerId, LidarrSettings settings)
public void RemoveIndexer(int indexerId, LidarrSettings settings)
{
var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.DELETE);
var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.Delete);
_httpClient.Execute(request);
}
public List<LidarrIndexer> GetIndexerSchema(LidarrSettings settings)
{
var request = BuildRequest(settings, "/api/v1/indexer/schema", HttpMethod.GET);
var request = BuildRequest(settings, "/api/v1/indexer/schema", HttpMethod.Get);
return Execute<List<LidarrIndexer>>(request);
}
public LidarrIndexer AddIndexer(LidarrIndexer indexer, LidarrSettings settings)
{
var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.POST);
var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.Post);
request.SetContent(indexer.ToJson());
@ -84,7 +85,7 @@ public LidarrIndexer AddIndexer(LidarrIndexer indexer, LidarrSettings settings)
public LidarrIndexer UpdateIndexer(LidarrIndexer indexer, LidarrSettings settings)
{
var request = BuildRequest(settings, $"/api/v1/indexer/{indexer.Id}", HttpMethod.PUT);
var request = BuildRequest(settings, $"/api/v1/indexer/{indexer.Id}", HttpMethod.Put);
request.SetContent(indexer.ToJson());
@ -93,7 +94,7 @@ public LidarrIndexer UpdateIndexer(LidarrIndexer indexer, LidarrSettings setting
public ValidationFailure TestConnection(LidarrIndexer indexer, LidarrSettings settings)
{
var request = BuildRequest(settings, $"/api/v1/indexer/test", HttpMethod.POST);
var request = BuildRequest(settings, $"/api/v1/indexer/test", HttpMethod.Post);
request.SetContent(indexer.ToJson());

11
src/NzbDrone.Core/Applications/Mylar/MylarV3Proxy.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using FluentValidation.Results;
using Newtonsoft.Json;
using NLog;
@ -31,13 +32,13 @@ public MylarV1Proxy(IHttpClient httpClient, Logger logger)
public MylarStatus GetStatus(MylarSettings settings)
{
var request = BuildRequest(settings, "/api", "getVersion", HttpMethod.GET);
var request = BuildRequest(settings, "/api", "getVersion", HttpMethod.Get);
return Execute<MylarStatus>(request);
}
public List<MylarIndexer> GetIndexers(MylarSettings settings)
{
var request = BuildRequest(settings, "/api", "listProviders", HttpMethod.GET);
var request = BuildRequest(settings, "/api", "listProviders", HttpMethod.Get);
var response = Execute<MylarIndexerResponse>(request);
@ -76,7 +77,7 @@ public void RemoveIndexer(string indexerName, MylarProviderType indexerType, Myl
{ "providertype", indexerType.ToString().ToLower() }
};
var request = BuildRequest(settings, "/api", "delProvider", HttpMethod.GET, parameters);
var request = BuildRequest(settings, "/api", "delProvider", HttpMethod.Get, parameters);
CheckForError(Execute<MylarStatus>(request));
}
@ -92,7 +93,7 @@ public MylarIndexer AddIndexer(MylarIndexer indexer, MylarSettings settings)
{ "categories", indexer.Categories }
};
var request = BuildRequest(settings, "/api", "addProvider", HttpMethod.GET, parameters);
var request = BuildRequest(settings, "/api", "addProvider", HttpMethod.Get, parameters);
CheckForError(Execute<MylarStatus>(request));
return indexer;
}
@ -110,7 +111,7 @@ public MylarIndexer UpdateIndexer(MylarIndexer indexer, MylarSettings settings)
{ "altername", indexer.Altername }
};
var request = BuildRequest(settings, "/api", "changeProvider", HttpMethod.GET, parameters);
var request = BuildRequest(settings, "/api", "changeProvider", HttpMethod.Get, parameters);
CheckForError(Execute<MylarStatus>(request));
return indexer;
}

17
src/NzbDrone.Core/Applications/Radarr/RadarrV3Proxy.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using FluentValidation.Results;
using Newtonsoft.Json;
using NLog;
@ -33,13 +34,13 @@ public RadarrV3Proxy(IHttpClient httpClient, Logger logger)
public RadarrStatus GetStatus(RadarrSettings settings)
{
var request = BuildRequest(settings, "/api/v3/system/status", HttpMethod.GET);
var request = BuildRequest(settings, "/api/v3/system/status", HttpMethod.Get);
return Execute<RadarrStatus>(request);
}
public List<RadarrIndexer> GetIndexers(RadarrSettings settings)
{
var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.GET);
var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Get);
return Execute<List<RadarrIndexer>>(request);
}
@ -47,7 +48,7 @@ public RadarrIndexer GetIndexer(int indexerId, RadarrSettings settings)
{
try
{
var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.GET);
var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Get);
return Execute<RadarrIndexer>(request);
}
catch (HttpException ex)
@ -63,19 +64,19 @@ public RadarrIndexer GetIndexer(int indexerId, RadarrSettings settings)
public void RemoveIndexer(int indexerId, RadarrSettings settings)
{
var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.DELETE);
var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Delete);
_httpClient.Execute(request);
}
public List<RadarrIndexer> GetIndexerSchema(RadarrSettings settings)
{
var request = BuildRequest(settings, "/api/v3/indexer/schema", HttpMethod.GET);
var request = BuildRequest(settings, "/api/v3/indexer/schema", HttpMethod.Get);
return Execute<List<RadarrIndexer>>(request);
}
public RadarrIndexer AddIndexer(RadarrIndexer indexer, RadarrSettings settings)
{
var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.POST);
var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Post);
request.SetContent(indexer.ToJson());
@ -84,7 +85,7 @@ public RadarrIndexer AddIndexer(RadarrIndexer indexer, RadarrSettings settings)
public RadarrIndexer UpdateIndexer(RadarrIndexer indexer, RadarrSettings settings)
{
var request = BuildRequest(settings, $"/api/v3/indexer/{indexer.Id}", HttpMethod.PUT);
var request = BuildRequest(settings, $"/api/v3/indexer/{indexer.Id}", HttpMethod.Put);
request.SetContent(indexer.ToJson());
@ -93,7 +94,7 @@ public RadarrIndexer UpdateIndexer(RadarrIndexer indexer, RadarrSettings setting
public ValidationFailure TestConnection(RadarrIndexer indexer, RadarrSettings settings)
{
var request = BuildRequest(settings, $"/api/v3/indexer/test", HttpMethod.POST);
var request = BuildRequest(settings, $"/api/v3/indexer/test", HttpMethod.Post);
request.SetContent(indexer.ToJson());

17
src/NzbDrone.Core/Applications/Readarr/ReadarrV1Proxy.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using FluentValidation.Results;
using Newtonsoft.Json;
using NLog;
@ -33,13 +34,13 @@ public ReadarrV1Proxy(IHttpClient httpClient, Logger logger)
public ReadarrStatus GetStatus(ReadarrSettings settings)
{
var request = BuildRequest(settings, "/api/v1/system/status", HttpMethod.GET);
var request = BuildRequest(settings, "/api/v1/system/status", HttpMethod.Get);
return Execute<ReadarrStatus>(request);
}
public List<ReadarrIndexer> GetIndexers(ReadarrSettings settings)
{
var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.GET);
var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.Get);
return Execute<List<ReadarrIndexer>>(request);
}
@ -47,7 +48,7 @@ public ReadarrIndexer GetIndexer(int indexerId, ReadarrSettings settings)
{
try
{
var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.GET);
var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.Get);
return Execute<ReadarrIndexer>(request);
}
catch (HttpException ex)
@ -63,19 +64,19 @@ public ReadarrIndexer GetIndexer(int indexerId, ReadarrSettings settings)
public void RemoveIndexer(int indexerId, ReadarrSettings settings)
{
var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.DELETE);
var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.Delete);
_httpClient.Execute(request);
}
public List<ReadarrIndexer> GetIndexerSchema(ReadarrSettings settings)
{
var request = BuildRequest(settings, "/api/v1/indexer/schema", HttpMethod.GET);
var request = BuildRequest(settings, "/api/v1/indexer/schema", HttpMethod.Get);
return Execute<List<ReadarrIndexer>>(request);
}
public ReadarrIndexer AddIndexer(ReadarrIndexer indexer, ReadarrSettings settings)
{
var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.POST);
var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.Post);
request.SetContent(indexer.ToJson());
@ -84,7 +85,7 @@ public ReadarrIndexer AddIndexer(ReadarrIndexer indexer, ReadarrSettings setting
public ReadarrIndexer UpdateIndexer(ReadarrIndexer indexer, ReadarrSettings settings)
{
var request = BuildRequest(settings, $"/api/v1/indexer/{indexer.Id}", HttpMethod.PUT);
var request = BuildRequest(settings, $"/api/v1/indexer/{indexer.Id}", HttpMethod.Put);
request.SetContent(indexer.ToJson());
@ -93,7 +94,7 @@ public ReadarrIndexer UpdateIndexer(ReadarrIndexer indexer, ReadarrSettings sett
public ValidationFailure TestConnection(ReadarrIndexer indexer, ReadarrSettings settings)
{
var request = BuildRequest(settings, $"/api/v1/indexer/test", HttpMethod.POST);
var request = BuildRequest(settings, $"/api/v1/indexer/test", HttpMethod.Post);
request.SetContent(indexer.ToJson());

17
src/NzbDrone.Core/Applications/Sonarr/SonarrV3Proxy.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using FluentValidation.Results;
using Newtonsoft.Json;
using NLog;
@ -33,13 +34,13 @@ public SonarrV3Proxy(IHttpClient httpClient, Logger logger)
public SonarrStatus GetStatus(SonarrSettings settings)
{
var request = BuildRequest(settings, "/api/v3/system/status", HttpMethod.GET);
var request = BuildRequest(settings, "/api/v3/system/status", HttpMethod.Get);
return Execute<SonarrStatus>(request);
}
public List<SonarrIndexer> GetIndexers(SonarrSettings settings)
{
var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.GET);
var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Get);
return Execute<List<SonarrIndexer>>(request);
}
@ -47,7 +48,7 @@ public SonarrIndexer GetIndexer(int indexerId, SonarrSettings settings)
{
try
{
var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.GET);
var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Get);
return Execute<SonarrIndexer>(request);
}
catch (HttpException ex)
@ -63,19 +64,19 @@ public SonarrIndexer GetIndexer(int indexerId, SonarrSettings settings)
public void RemoveIndexer(int indexerId, SonarrSettings settings)
{
var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.DELETE);
var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Delete);
_httpClient.Execute(request);
}
public List<SonarrIndexer> GetIndexerSchema(SonarrSettings settings)
{
var request = BuildRequest(settings, "/api/v3/indexer/schema", HttpMethod.GET);
var request = BuildRequest(settings, "/api/v3/indexer/schema", HttpMethod.Get);
return Execute<List<SonarrIndexer>>(request);
}
public SonarrIndexer AddIndexer(SonarrIndexer indexer, SonarrSettings settings)
{
var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.POST);
var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Post);
request.SetContent(indexer.ToJson());
@ -84,7 +85,7 @@ public SonarrIndexer AddIndexer(SonarrIndexer indexer, SonarrSettings settings)
public SonarrIndexer UpdateIndexer(SonarrIndexer indexer, SonarrSettings settings)
{
var request = BuildRequest(settings, $"/api/v3/indexer/{indexer.Id}", HttpMethod.PUT);
var request = BuildRequest(settings, $"/api/v3/indexer/{indexer.Id}", HttpMethod.Put);
request.SetContent(indexer.ToJson());
@ -93,7 +94,7 @@ public SonarrIndexer UpdateIndexer(SonarrIndexer indexer, SonarrSettings setting
public ValidationFailure TestConnection(SonarrIndexer indexer, SonarrSettings settings)
{
var request = BuildRequest(settings, $"/api/v3/indexer/test", HttpMethod.POST);
var request = BuildRequest(settings, $"/api/v3/indexer/test", HttpMethod.Post);
request.SetContent(indexer.ToJson());

13
src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DiskStationProxyBase.cs
View file

@ -1,6 +1,7 @@
using System;
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using NLog;
using NzbDrone.Common.Cache;
using NzbDrone.Common.Http;
@ -142,15 +143,19 @@ private string AuthenticateClient(DownloadStationSettings settings)
return authResponse.Data.SId;
}
protected HttpRequestBuilder BuildRequest(DownloadStationSettings settings, string methodName, int apiVersion, HttpMethod httpVerb = HttpMethod.GET)
protected HttpRequestBuilder BuildRequest(DownloadStationSettings settings, string methodName, int apiVersion, HttpMethod httpVerb = null)
{
httpVerb ??= HttpMethod.Get;
var info = GetApiInfo(_apiType, settings);
return BuildRequest(settings, info, methodName, apiVersion, httpVerb);
}
private HttpRequestBuilder BuildRequest(DownloadStationSettings settings, DiskStationApiInfo apiInfo, string methodName, int apiVersion, HttpMethod httpVerb = HttpMethod.GET)
private HttpRequestBuilder BuildRequest(DownloadStationSettings settings, DiskStationApiInfo apiInfo, string methodName, int apiVersion, HttpMethod httpVerb = null)
{
httpVerb ??= HttpMethod.Get;
var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port).Resource($"webapi/{apiInfo.Path}");
requestBuilder.Method = httpVerb;
requestBuilder.LogResponseContent = true;
@ -163,7 +168,7 @@ private HttpRequestBuilder BuildRequest(DownloadStationSettings settings, DiskSt
throw new ArgumentOutOfRangeException(nameof(apiVersion));
}
if (httpVerb == HttpMethod.POST)
if (httpVerb == HttpMethod.Post)
{
if (apiInfo.NeedsAuthentication)
{

5
src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationTaskProxy.cs
View file

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Net.Http;
using NLog;
using NzbDrone.Common.Cache;
using NzbDrone.Common.Extensions;
@ -24,7 +25,7 @@ public DownloadStationTaskProxy(IHttpClient httpClient, ICacheManager cacheManag
public void AddTaskFromData(byte[] data, string filename, string downloadDirectory, DownloadStationSettings settings)
{
var requestBuilder = BuildRequest(settings, "create", 2, HttpMethod.POST);
var requestBuilder = BuildRequest(settings, "create", 2, HttpMethod.Post);
if (downloadDirectory.IsNotNullOrWhiteSpace())
{

9
src/NzbDrone.Core/Download/Clients/Flood/FloodProxy.cs
View file

@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using NLog;
using NzbDrone.Common.Cache;
using NzbDrone.Common.Http;
@ -107,7 +108,7 @@ public void AuthVerify(FloodSettings settings)
{
var verifyRequest = BuildRequest(settings).Resource("/auth/verify").Build();
verifyRequest.Method = HttpMethod.GET;
verifyRequest.Method = HttpMethod.Get;
HandleRequest(verifyRequest, settings);
}
@ -180,7 +181,7 @@ public Dictionary<string, Torrent> GetTorrents(FloodSettings settings)
{
var getTorrentsRequest = BuildRequest(settings).Resource("/torrents").Build();
getTorrentsRequest.Method = HttpMethod.GET;
getTorrentsRequest.Method = HttpMethod.Get;
return Json.Deserialize<TorrentListSummary>(HandleRequest(getTorrentsRequest, settings).Content).Torrents;
}
@ -189,7 +190,7 @@ public List<string> GetTorrentContentPaths(string hash, FloodSettings settings)
{
var contentsRequest = BuildRequest(settings).Resource($"/torrents/{hash}/contents").Build();
contentsRequest.Method = HttpMethod.GET;
contentsRequest.Method = HttpMethod.Get;
return Json.Deserialize<List<TorrentContent>>(HandleRequest(contentsRequest, settings).Content).ConvertAll(content => content.Path);
}
@ -198,7 +199,7 @@ public void SetTorrentsTags(string hash, IEnumerable<string> tags, FloodSettings
{
var tagsRequest = BuildRequest(settings).Resource("/torrents/tags").Build();
tagsRequest.Method = HttpMethod.PATCH;
tagsRequest.Method = HttpMethod.Patch;
var body = new Dictionary<string, object>
{

7
src/NzbDrone.Core/IndexerProxies/FlareSolverr/FlareSolverr.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using FluentValidation.Results;
using Newtonsoft.Json;
using NLog;
@ -115,7 +116,7 @@ private HttpRequest GenerateFlareSolverrRequest(HttpRequest request)
var userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36";
var maxTimeout = Settings.RequestTimeout * 1000;
if (request.Method == HttpMethod.GET)
if (request.Method == HttpMethod.Get)
{
req = new FlareSolverrRequestGet
{
@ -125,7 +126,7 @@ private HttpRequest GenerateFlareSolverrRequest(HttpRequest request)
UserAgent = userAgent
};
}
else if (request.Method == HttpMethod.POST)
else if (request.Method == HttpMethod.Post)
{
var contentTypeType = request.Headers.ContentType;
@ -167,7 +168,7 @@ private HttpRequest GenerateFlareSolverrRequest(HttpRequest request)
var newRequest = new HttpRequest(apiUrl, HttpAccept.Json);
newRequest.Headers.ContentType = "application/json";
newRequest.Method = HttpMethod.POST;
newRequest.Method = HttpMethod.Post;
newRequest.SetContent(req.ToJson());
_logger.Debug("Applying FlareSolverr Proxy {0} to request {1}", Name, request.Url);

4
src/NzbDrone.Core/Indexers/Definitions/Anidub.cs
View file

@ -60,7 +60,7 @@ protected override async Task DoLogin()
var mainPage = await ExecuteAuth(new HttpRequest(Settings.BaseUrl));
requestBuilder.Method = Common.Http.HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
requestBuilder.SetCookies(mainPage.GetCookies());
@ -167,7 +167,7 @@ private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categori
if (isSearch)
{
request.HttpRequest.Method = NzbDrone.Common.Http.HttpMethod.POST;
request.HttpRequest.Method = HttpMethod.Post;
var postData = new NameValueCollection
{
{ "do", "search" },

3
src/NzbDrone.Core/Indexers/Definitions/AnimeTorrents.cs
View file

@ -3,6 +3,7 @@
using System.Collections.Specialized;
using System.Globalization;
using System.Linq;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using AngleSharp.Html.Parser;
@ -57,7 +58,7 @@ protected override async Task DoLogin()
};
var loginPage = await ExecuteAuth(new HttpRequest(LoginUrl));
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
requestBuilder.SetCookies(loginPage.GetCookies());

3
src/NzbDrone.Core/Indexers/Definitions/Anthelion.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using AngleSharp.Html.Parser;
@ -56,7 +57,7 @@ protected override async Task DoLogin()
AllowAutoRedirect = true
};
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
var cookies = Cookies;

3
src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazBase.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using FluentValidation.Results;
using NLog;
@ -105,7 +106,7 @@ private async Task<string> GetToken()
LogResponseContent = true
};
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
var authLoginRequest = requestBuilder

3
src/NzbDrone.Core/Indexers/Definitions/BB.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Net.Http;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@ -55,7 +56,7 @@ protected override async Task DoLogin()
AllowAutoRedirect = true
};
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
var cookies = Cookies;

3
src/NzbDrone.Core/Indexers/Definitions/BakaBT.cs
View file

@ -3,6 +3,7 @@
using System.Globalization;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using AngleSharp.Dom;
@ -79,7 +80,7 @@ protected override async Task DoLogin()
var loginPage = await ExecuteAuth(new HttpRequest(LoginUrl));
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
requestBuilder.SetCookies(loginPage.GetCookies());

3
src/NzbDrone.Core/Indexers/Definitions/BeyondHD.cs
View file

@ -3,6 +3,7 @@
using System.Globalization;
using System.Linq;
using System.Net;
using System.Net.Http;
using FluentValidation;
using Newtonsoft.Json;
using NLog;
@ -110,7 +111,7 @@ private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categori
var request = new HttpRequest(searchUrl, HttpAccept.Json);
request.Headers.Add("Content-type", "application/json");
request.Method = HttpMethod.POST;
request.Method = HttpMethod.Post;
request.SetContent(body.ToJson());
var indexerRequest = new IndexerRequest(request);

37
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
View file

@ -3,6 +3,7 @@
using System.Collections.Specialized;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using AngleSharp.Html.Dom;
@ -184,7 +185,7 @@ public async Task DoLogin()
var requestBuilder = new HttpRequestBuilder(loginUrl)
{
LogResponseContent = true,
Method = HttpMethod.POST,
Method = HttpMethod.Post,
AllowAutoRedirect = true,
SuppressHttpError = true,
Encoding = _encoding
@ -329,7 +330,7 @@ public async Task DoLogin()
var requestBuilder = new HttpRequestBuilder(captchaUrl.ToString())
{
LogResponseContent = true,
Method = HttpMethod.GET,
Method = HttpMethod.Get,
Encoding = _encoding
};
@ -394,7 +395,7 @@ public async Task DoLogin()
var requestBuilder = new HttpRequestBuilder(submitUrl.ToString())
{
LogResponseContent = true,
Method = HttpMethod.POST,
Method = HttpMethod.Post,
AllowAutoRedirect = true,
Encoding = _encoding
};
@ -423,7 +424,7 @@ public async Task DoLogin()
var requestBuilder = new HttpRequestBuilder(submitUrl.ToString())
{
LogResponseContent = true,
Method = HttpMethod.POST,
Method = HttpMethod.Post,
AllowAutoRedirect = true,
SuppressHttpError = true,
Encoding = _encoding
@ -466,7 +467,7 @@ public async Task DoLogin()
var requestBuilder = new HttpRequestBuilder(loginUrl)
{
LogResponseContent = true,
Method = HttpMethod.GET,
Method = HttpMethod.Get,
SuppressHttpError = true,
Encoding = _encoding
};
@ -491,7 +492,7 @@ public async Task DoLogin()
var requestBuilder = new HttpRequestBuilder(loginUrl)
{
LogResponseContent = true,
Method = HttpMethod.GET,
Method = HttpMethod.Get,
SuppressHttpError = true,
Encoding = _encoding
};
@ -565,7 +566,7 @@ public async Task<Captcha> GetConfigurationForSetup(bool automaticlogin)
var requestBuilder = new HttpRequestBuilder(loginUrl.AbsoluteUri)
{
LogResponseContent = true,
Method = HttpMethod.GET,
Method = HttpMethod.Get,
Encoding = _encoding
};
@ -666,21 +667,21 @@ protected async Task<HttpResponse> HandleRequest(RequestBlock request, Dictionar
Dictionary<string, string> pairs = null;
var queryCollection = new NameValueCollection();
var method = HttpMethod.GET;
var method = HttpMethod.Get;
if (string.Equals(request.Method, "post", StringComparison.OrdinalIgnoreCase))
{
method = HttpMethod.POST;
method = HttpMethod.Post;
pairs = new Dictionary<string, string>();
}
foreach (var input in request.Inputs)
{
var value = ApplyGoTemplateText(input.Value, variables);
if (method == HttpMethod.GET)
if (method == HttpMethod.Get)
{
queryCollection.Add(input.Key, value);
}
else if (method == HttpMethod.POST)
else if (method == HttpMethod.Post)
{
pairs.Add(input.Key, value);
}
@ -707,7 +708,7 @@ protected async Task<HttpResponse> HandleRequest(RequestBlock request, Dictionar
httpRequest.Method = method;
// Add form data for POST requests
if (method == HttpMethod.POST)
if (method == HttpMethod.Post)
{
foreach (var param in pairs)
{
@ -724,7 +725,7 @@ protected async Task<HttpResponse> HandleRequest(RequestBlock request, Dictionar
public async Task<HttpRequest> DownloadRequest(Uri link)
{
Cookies = GetCookies();
var method = HttpMethod.GET;
var method = HttpMethod.Get;
var headers = new Dictionary<string, string>();
var variables = GetBaseTemplateVariables();
@ -759,7 +760,7 @@ public async Task<HttpRequest> DownloadRequest(Uri link)
if (download.Method == "post")
{
method = HttpMethod.POST;
method = HttpMethod.Post;
}
if (download.Infohash != null)
@ -1014,11 +1015,11 @@ private IEnumerable<IndexerRequest> GetRequest(Dictionary<string, object> variab
// HttpUtility.UrlPathEncode seems to only encode spaces, we use UrlEncode and replace + with %20 as a workaround
var searchUrl = ResolvePath(ApplyGoTemplateText(searchPath.Path, variables, WebUtility.UrlEncode).Replace("+", "%20")).AbsoluteUri;
var queryCollection = new List<KeyValuePair<string, string>>();
var method = HttpMethod.GET;
var method = HttpMethod.Get;
if (string.Equals(searchPath.Method, "post", StringComparison.OrdinalIgnoreCase))
{
method = HttpMethod.POST;
method = HttpMethod.Post;
}
var inputsList = new List<Dictionary<string, string>>();
@ -1064,7 +1065,7 @@ private IEnumerable<IndexerRequest> GetRequest(Dictionary<string, object> variab
}
}
if (method == HttpMethod.GET)
if (method == HttpMethod.Get)
{
if (queryCollection.Count > 0)
{
@ -1079,7 +1080,7 @@ private IEnumerable<IndexerRequest> GetRequest(Dictionary<string, object> variab
requestbuilder.Method = method;
// Add FormData for searchs that POST
if (method == HttpMethod.POST)
if (method == HttpMethod.Post)
{
foreach (var param in queryCollection)
{

3
src/NzbDrone.Core/Indexers/Definitions/Gazelle/Gazelle.cs
View file

@ -1,4 +1,5 @@
using System;
using System.Net.Http;
using System.Threading.Tasks;
using NLog;
using NzbDrone.Common.Http;
@ -56,7 +57,7 @@ protected override async Task DoLogin()
LogResponseContent = true
};
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
var cookies = Cookies;

3
src/NzbDrone.Core/Indexers/Definitions/HDBits/HDBitsRequestGenerator.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http;
using NzbDrone.Common.Serializer;
@ -50,7 +51,7 @@ private IEnumerable<IndexerRequest> GetRequest(TorrentQuery query)
.Resource("/api/torrents")
.Build();
request.Method = HttpMethod.POST;
request.Method = HttpMethod.Post;
const string appJson = "application/json";
request.Headers.Accept = appJson;
request.Headers.ContentType = appJson;

3
src/NzbDrone.Core/Indexers/Definitions/HDSpace.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@ -57,7 +58,7 @@ protected override async Task DoLogin()
AllowAutoRedirect = true
};
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
var cookies = Cookies;

3
src/NzbDrone.Core/Indexers/Definitions/HDTorrents.cs
View file

@ -3,6 +3,7 @@
using System.Collections.Specialized;
using System.Globalization;
using System.Linq;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using AngleSharp.Html.Parser;
@ -52,7 +53,7 @@ protected override async Task DoLogin()
LogResponseContent = true
};
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
var cookies = Cookies;

3
src/NzbDrone.Core/Indexers/Definitions/ImmortalSeed.cs
View file

@ -3,6 +3,7 @@
using System.Globalization;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using AngleSharp.Html.Parser;
using FluentValidation;
@ -54,7 +55,7 @@ protected override async Task DoLogin()
LogResponseContent = true
};
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
var cookies = Cookies;

3
src/NzbDrone.Core/Indexers/Definitions/Nebulance.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Globalization;
using System.Net.Http;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@ -53,7 +54,7 @@ protected override async Task DoLogin()
LogResponseContent = true
};
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
var cookies = Cookies;

3
src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabCapabilitiesProvider.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Net.Http;
using System.Xml;
using System.Xml.Linq;
using NLog;
@ -50,7 +51,7 @@ private IndexerCapabilities FetchCapabilities(NewznabSettings indexerSettings, P
var request = new HttpRequest(url, HttpAccept.Rss);
request.AllowAutoRedirect = true;
request.Method = HttpMethod.GET;
request.Method = HttpMethod.Get;
HttpResponse response;

3
src/NzbDrone.Core/Indexers/Definitions/NorBits.cs
View file

@ -3,6 +3,7 @@
using System.Collections.Specialized;
using System.Globalization;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@ -79,7 +80,7 @@ protected override async Task DoLogin()
{
LogResponseContent = true,
AllowAutoRedirect = true,
Method = HttpMethod.POST
Method = HttpMethod.Post
};
var authLoginCheckRequest = requestBuilder3

3
src/NzbDrone.Core/Indexers/Definitions/PornoLab.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Net.Http;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@ -52,7 +53,7 @@ protected override async Task DoLogin()
{
LogResponseContent = true,
AllowAutoRedirect = true,
Method = HttpMethod.POST
Method = HttpMethod.Post
};
var authLoginRequest = requestBuilder

3
src/NzbDrone.Core/Indexers/Definitions/PreToMe.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@ -59,7 +60,7 @@ protected override async Task DoLogin()
var loginPage = await ExecuteAuth(new HttpRequest(Settings.BaseUrl + "login.php"));
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
requestBuilder.SetCookies(loginPage.GetCookies());

3
src/NzbDrone.Core/Indexers/Definitions/RevolutionTT.cs
View file

@ -3,6 +3,7 @@
using System.Collections.Specialized;
using System.Globalization;
using System.Linq;
using System.Net.Http;
using System.Threading.Tasks;
using AngleSharp.Html.Parser;
using FluentValidation;
@ -58,7 +59,7 @@ protected override async Task DoLogin()
var loginPage = await ExecuteAuth(new HttpRequest(Settings.BaseUrl + "login.php"));
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
requestBuilder.SetCookies(loginPage.GetCookies());

3
src/NzbDrone.Core/Indexers/Definitions/RuTracker.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@ -57,7 +58,7 @@ protected override async Task DoLogin()
AllowAutoRedirect = true
};
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
var cookies = Cookies;

3
src/NzbDrone.Core/Indexers/Definitions/SpeedApp.cs
View file

@ -3,6 +3,7 @@
using System.Collections.Specialized;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Net.Mime;
using System.Text;
using System.Threading.Tasks;
@ -75,7 +76,7 @@ protected override async Task DoLogin()
{
LogResponseContent = true,
AllowAutoRedirect = true,
Method = HttpMethod.POST,
Method = HttpMethod.Post,
};
var request = requestBuilder.Build();

5
src/NzbDrone.Core/Indexers/Definitions/SpeedCD.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@ -57,7 +58,7 @@ protected override async Task DoLogin()
{
var requestBuilder = new HttpRequestBuilder(string.Format("{0}/{1}", Settings.BaseUrl.TrimEnd('/'), "checkpoint/API"))
{
Method = HttpMethod.POST,
Method = HttpMethod.Post,
LogResponseContent = true,
AllowAutoRedirect = true
};
@ -77,7 +78,7 @@ protected override async Task DoLogin()
var requestBuilder2 = new HttpRequestBuilder(string.Format("{0}/{1}", Settings.BaseUrl.TrimEnd('/'), "checkpoint/"))
{
Method = HttpMethod.POST,
Method = HttpMethod.Post,
LogResponseContent = true,
AllowAutoRedirect = true
};

3
src/NzbDrone.Core/Indexers/Definitions/TVVault.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@ -59,7 +60,7 @@ protected override async Task DoLogin()
AllowAutoRedirect = true
};
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
var cookies = Cookies;

3
src/NzbDrone.Core/Indexers/Definitions/TorrentLeech.cs
View file

@ -3,6 +3,7 @@
using System.Globalization;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using FluentValidation;
@ -54,7 +55,7 @@ protected override async Task DoLogin()
LogResponseContent = true
};
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
var cookies = Cookies;

3
src/NzbDrone.Core/Indexers/Definitions/TorrentSeeds.cs
View file

@ -3,6 +3,7 @@
using System.Collections.Specialized;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using AngleSharp.Html.Parser;
@ -63,7 +64,7 @@ protected override async Task DoLogin()
var json1 = JObject.Parse(loginPage.Content);
var captchaSelection = json1["images"][0]["hash"];
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
requestBuilder.SetCookies(loginPage.GetCookies());

5
src/NzbDrone.Core/Indexers/Definitions/ZonaQ.cs
View file

@ -3,6 +3,7 @@
using System.Collections.Specialized;
using System.Globalization;
using System.Linq;
using System.Net.Http;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
@ -79,7 +80,7 @@ protected override async Task DoLogin()
LogResponseContent = true
};
requestBuilder.Method = HttpMethod.POST;
requestBuilder.Method = HttpMethod.Post;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
requestBuilder.SetCookies(loginPage.GetCookies());
@ -102,7 +103,7 @@ protected override async Task DoLogin()
LogResponseContent = true
};
requestBuilder2.Method = HttpMethod.POST;
requestBuilder2.Method = HttpMethod.Post;
requestBuilder2.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
requestBuilder2.SetCookies(response.GetCookies());

3
src/NzbDrone.Core/Notifications/Discord/DiscordProxy.cs
View file

@ -1,3 +1,4 @@
using System.Net.Http;
using NLog;
using NzbDrone.Common.Http;
using NzbDrone.Common.Serializer;
@ -29,7 +30,7 @@ public void SendPayload(DiscordPayload payload, DiscordSettings settings)
.Accept(HttpAccept.Json)
.Build();
request.Method = HttpMethod.POST;
request.Method = HttpMethod.Post;
request.Headers.ContentType = "application/json";
request.SetContent(payload.ToJson());

3
src/NzbDrone.Core/Notifications/Join/JoinProxy.cs
View file

@ -1,4 +1,5 @@
using System;
using System.Net.Http;
using FluentValidation.Results;
using NLog;
using NzbDrone.Common.Extensions;
@ -27,7 +28,7 @@ public JoinProxy(IHttpClient httpClient, Logger logger)
public void SendNotification(string title, string message, JoinSettings settings)
{
var method = HttpMethod.GET;
var method = HttpMethod.Get;
try
{

3
src/NzbDrone.Core/Notifications/PushBullet/PushBulletProxy.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using FluentValidation.Results;
using NLog;
using NzbDrone.Common.Extensions;
@ -100,7 +101,7 @@ public List<PushBulletDevice> GetDevices(PushBulletSettings settings)
var request = requestBuilder.Build();
request.Method = HttpMethod.GET;
request.Method = HttpMethod.Get;
request.AddBasicAuthentication(settings.ApiKey, string.Empty);
var response = _httpClient.Execute(request);

3
src/NzbDrone.Core/Notifications/SendGrid/SendGridProxy.cs
View file

@ -1,4 +1,5 @@
using System.Net;
using System.Net.Http;
using NzbDrone.Common.Http;
using NzbDrone.Common.Serializer;
@ -22,7 +23,7 @@ public void SendNotification(string title, string message, SendGridSettings sett
{
try
{
var request = BuildRequest(settings, "mail/send", HttpMethod.POST);
var request = BuildRequest(settings, "mail/send", HttpMethod.Post);
var payload = new SendGridPayload
{

3
src/NzbDrone.Core/Notifications/Slack/SlackProxy.cs
View file

@ -1,3 +1,4 @@
using System.Net.Http;
using NLog;
using NzbDrone.Common.Http;
using NzbDrone.Common.Serializer;
@ -29,7 +30,7 @@ public void SendPayload(SlackPayload payload, SlackSettings settings)
.Accept(HttpAccept.Json)
.Build();
request.Method = HttpMethod.POST;
request.Method = HttpMethod.Post;
request.Headers.ContentType = "application/json";
request.SetContent(payload.ToJson());

5
src/NzbDrone.Core/Notifications/Webhook/WebhookMethod.cs
View file

@ -1,10 +1,11 @@
using System.Net.Http;
using NzbDrone.Common.Http;
namespace NzbDrone.Core.Notifications.Webhook
{
public enum WebhookMethod
{
POST = HttpMethod.POST,
PUT = HttpMethod.PUT
POST = 1,
PUT = 2
}
}

10
src/NzbDrone.Core/Notifications/Webhook/WebhookProxy.cs
View file

@ -1,3 +1,5 @@
using System;
using System.Net.Http;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http;
using NzbDrone.Common.Serializer;
@ -26,7 +28,13 @@ public void SendWebhook(WebhookPayload body, WebhookSettings settings)
.Accept(HttpAccept.Json)
.Build();
request.Method = (HttpMethod)settings.Method;
request.Method = settings.Method switch
{
(int)WebhookMethod.POST => HttpMethod.Post,
(int)WebhookMethod.PUT => HttpMethod.Put,
_ => throw new ArgumentOutOfRangeException($"Invalid Webhook method {settings.Method}")
};
request.Headers.ContentType = "application/json";
request.SetContent(body.ToJson());