From 234995cbafef4a3e3eba18fc13ecaad4563a2b35 Mon Sep 17 00:00:00 2001 From: Qstick Date: Wed, 6 Oct 2021 19:33:47 -0500 Subject: [PATCH] Rename indexer proxied HTTP methods for clarification --- .../AvistazTests/PrivateHDFixture.cs | 2 +- .../FileListTests/FileListFixture.cs | 2 +- .../IndexerTests/HDBitsTests/HDBitsFixture.cs | 4 ++-- .../NewznabCapabilitiesProviderFixture.cs | 6 +++--- .../NewznabTests/NewznabFixture.cs | 2 +- .../IndexerTests/PTPTests/PTPFixture.cs | 4 ++-- .../IndexerTests/RarbgTests/RarbgFixture.cs | 6 +++--- .../TorznabTests/TorznabFixture.cs | 6 +++--- .../Indexers/Definitions/BakaBT.cs | 2 +- .../Definitions/Cardigann/Cardigann.cs | 2 +- .../Cardigann/CardigannRequestGenerator.cs | 20 +++++++++---------- .../Definitions/Headphones/Headphones.cs | 2 +- .../Newznab/NewznabCapabilitiesProvider.cs | 2 +- .../Indexers/Definitions/SpeedApp.cs | 2 +- src/NzbDrone.Core/Indexers/HttpIndexerBase.cs | 6 +++--- .../Indexers/IndexerHttpClient.cs | 8 ++++---- .../Indexers/TorrentIndexerBase.cs | 2 +- .../Indexers/UsenetIndexerBase.cs | 2 +- 18 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/NzbDrone.Core.Test/IndexerTests/AvistazTests/PrivateHDFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/AvistazTests/PrivateHDFixture.cs index 86469cdc8..377fdd968 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/AvistazTests/PrivateHDFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/AvistazTests/PrivateHDFixture.cs @@ -34,7 +34,7 @@ public async Task should_parse_recent_feed_from_PrivateHD() var recentFeed = ReadAllText(@"Files/Indexers/PrivateHD/recentfeed.json"); Mocker.GetMock() - .Setup(o => o.ExecuteAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) + .Setup(o => o.ExecuteProxiedAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) .Returns((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; diff --git a/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs index 63570a01e..12f12c095 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs @@ -33,7 +33,7 @@ public async Task should_parse_recent_feed_from_FileList() var recentFeed = ReadAllText(@"Files/Indexers/FileList/recentfeed.json"); Mocker.GetMock() - .Setup(o => o.ExecuteAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) + .Setup(o => o.ExecuteProxiedAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) .Returns((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed))); var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases; diff --git a/src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsFixture.cs index 49feabe43..91e3efcf0 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsFixture.cs @@ -45,7 +45,7 @@ public async Task should_parse_recent_feed_from_HDBits(string fileName) var responseJson = ReadAllText(fileName); Mocker.GetMock() - .Setup(o => o.ExecuteAsync(It.Is(v => v.Method == HttpMethod.POST), Subject.Definition)) + .Setup(o => o.ExecuteProxiedAsync(It.Is(v => v.Method == HttpMethod.POST), Subject.Definition)) .Returns((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), responseJson))); var torrents = (await Subject.Fetch(_movieSearchCriteria)).Releases; @@ -74,7 +74,7 @@ public async Task should_warn_on_wrong_passkey() var responseJson = new { status = 5, message = "Invalid authentication credentials" }.ToJson(); Mocker.GetMock() - .Setup(o => o.ExecuteAsync(It.IsAny(), Subject.Definition)) + .Setup(o => o.ExecuteProxiedAsync(It.IsAny(), Subject.Definition)) .Returns((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), Encoding.UTF8.GetBytes(responseJson)))); var torrents = (await Subject.Fetch(_movieSearchCriteria)).Releases; diff --git a/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabCapabilitiesProviderFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabCapabilitiesProviderFixture.cs index 03aa7da01..a5a7c7c14 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabCapabilitiesProviderFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabCapabilitiesProviderFixture.cs @@ -43,7 +43,7 @@ public void SetUp() private void GivenCapsResponse(string caps) { Mocker.GetMock() - .Setup(o => o.Execute(It.IsAny(), It.IsAny())) + .Setup(o => o.ExecuteProxied(It.IsAny(), It.IsAny())) .Returns((r, d) => new HttpResponse(r, new HttpHeader(), new CookieCollection(), caps)); } @@ -56,7 +56,7 @@ public void should_not_request_same_caps_twice() Subject.GetCapabilities(_settings, _definition); Mocker.GetMock() - .Verify(o => o.Execute(It.IsAny(), It.IsAny()), Times.Once()); + .Verify(o => o.ExecuteProxied(It.IsAny(), It.IsAny()), Times.Once()); } [Test] @@ -85,7 +85,7 @@ public void should_use_default_pagesize_if_missing() public void should_throw_if_failed_to_get() { Mocker.GetMock() - .Setup(o => o.Execute(It.IsAny(), It.IsAny())) + .Setup(o => o.ExecuteProxied(It.IsAny(), It.IsAny())) .Throws(); Assert.Throws(() => Subject.GetCapabilities(_settings, _definition)); diff --git a/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs index 77120b8d4..75ba1038c 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs @@ -43,7 +43,7 @@ public async Task should_parse_recent_feed_from_newznab_nzb_su() var recentFeed = ReadAllText(@"Files/Indexers/Newznab/newznab_nzb_su.xml"); Mocker.GetMock() - .Setup(o => o.ExecuteAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) + .Setup(o => o.ExecuteProxiedAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) .Returns((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; diff --git a/src/NzbDrone.Core.Test/IndexerTests/PTPTests/PTPFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/PTPTests/PTPFixture.cs index 736386139..b9827e838 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/PTPTests/PTPFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/PTPTests/PTPFixture.cs @@ -37,11 +37,11 @@ public async Task should_parse_feed_from_PTP(string fileName) var responseJson = ReadAllText(fileName); Mocker.GetMock() - .Setup(o => o.ExecuteAsync(It.Is(v => v.Method == HttpMethod.POST), Subject.Definition)) + .Setup(o => o.ExecuteProxiedAsync(It.Is(v => v.Method == HttpMethod.POST), Subject.Definition)) .Returns((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), authStream.ToString()))); Mocker.GetMock() - .Setup(o => o.ExecuteAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) + .Setup(o => o.ExecuteProxiedAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) .Returns((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader { ContentType = HttpAccept.Json.Value }, new CookieCollection(), responseJson))); var torrents = (await Subject.Fetch(new MovieSearchCriteria())).Releases; diff --git a/src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs index 7d6fd31d5..89e3eafb7 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs @@ -38,7 +38,7 @@ public async Task should_parse_recent_feed_from_Rarbg() var recentFeed = ReadAllText(@"Files/Indexers/Rarbg/RecentFeed_v2.json"); Mocker.GetMock() - .Setup(o => o.ExecuteAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) + .Setup(o => o.ExecuteProxiedAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) .Returns((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed))); var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases; @@ -65,7 +65,7 @@ public async Task should_parse_recent_feed_from_Rarbg() public async Task should_parse_error_20_as_empty_results() { Mocker.GetMock() - .Setup(o => o.ExecuteAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) + .Setup(o => o.ExecuteProxiedAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) .Returns((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; @@ -77,7 +77,7 @@ public async Task should_parse_error_20_as_empty_results() public async Task should_warn_on_unknown_error() { Mocker.GetMock() - .Setup(o => o.ExecuteAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) + .Setup(o => o.ExecuteProxiedAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) .Returns((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; diff --git a/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs index 444ad4433..588a41349 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs @@ -44,7 +44,7 @@ public async Task should_parse_recent_feed_from_torznab_hdaccess_net() var recentFeed = ReadAllText(@"Files/Indexers/Torznab/torznab_hdaccess_net.xml"); Mocker.GetMock() - .Setup(o => o.ExecuteAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) + .Setup(o => o.ExecuteProxiedAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) .Returns((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed))); var releases = (await Subject.Fetch(new MovieSearchCriteria())).Releases; @@ -73,7 +73,7 @@ public async Task should_parse_recent_feed_from_torznab_tpb() var recentFeed = ReadAllText(@"Files/Indexers/Torznab/torznab_tpb.xml"); Mocker.GetMock() - .Setup(o => o.ExecuteAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) + .Setup(o => o.ExecuteProxiedAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) .Returns((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed))); var releases = (await Subject.Fetch(new MovieSearchCriteria())).Releases; @@ -103,7 +103,7 @@ public async Task should_parse_recent_feed_from_torznab_animetosho() var recentFeed = ReadAllText(@"Files/Indexers/Torznab/torznab_animetosho.xml"); Mocker.GetMock() - .Setup(o => o.ExecuteAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) + .Setup(o => o.ExecuteProxiedAsync(It.Is(v => v.Method == HttpMethod.GET), Subject.Definition)) .Returns((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed))); var releases = (await Subject.Fetch(new MovieSearchCriteria())).Releases; diff --git a/src/NzbDrone.Core/Indexers/Definitions/BakaBT.cs b/src/NzbDrone.Core/Indexers/Definitions/BakaBT.cs index dd9001134..a9e0e601d 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/BakaBT.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/BakaBT.cs @@ -52,7 +52,7 @@ public override async Task Download(Uri link) .SetCookies(GetCookies() ?? new Dictionary()) .Build(); - var response = await _httpClient.ExecuteAsync(request, Definition); + var response = await _httpClient.ExecuteProxiedAsync(request, Definition); var parser = new HtmlParser(); var dom = parser.ParseDocument(response.Content); diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs index 3ba142241..f2759f848 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs @@ -177,7 +177,7 @@ public override async Task Download(Uri link) try { - var response = await _httpClient.ExecuteAsync(request, Definition); + var response = await _httpClient.ExecuteProxiedAsync(request, Definition); downloadBytes = response.ResponseData; } catch (HttpException ex) diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs index 644229ad2..9fe82b64d 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs @@ -194,7 +194,7 @@ public async Task DoLogin() requestBuilder.Headers.Add("Referer", SiteLink); - var response = await HttpClient.ExecuteAsync(requestBuilder.Build(), Definition); + var response = await HttpClient.ExecuteProxiedAsync(requestBuilder.Build(), Definition); Cookies = response.GetCookies(); @@ -331,7 +331,7 @@ public async Task DoLogin() requestBuilder.Headers.Add("Referer", loginUrl); - var simpleCaptchaResult = await HttpClient.ExecuteAsync(requestBuilder.Build(), Definition); + var simpleCaptchaResult = await HttpClient.ExecuteProxiedAsync(requestBuilder.Build(), Definition); var simpleCaptchaJSON = JObject.Parse(simpleCaptchaResult.Content); var captchaSelection = simpleCaptchaJSON["images"][0]["hash"].ToString(); @@ -411,7 +411,7 @@ public async Task DoLogin() var request = requestBuilder.Build(); request.SetContent(body); - loginResult = await HttpClient.ExecuteAsync(request, Definition); + loginResult = await HttpClient.ExecuteProxiedAsync(request, Definition); } else { @@ -431,7 +431,7 @@ public async Task DoLogin() requestBuilder.AddFormParameter(pair.Key, pair.Value); } - loginResult = await HttpClient.ExecuteAsync(requestBuilder.Build(), Definition); + loginResult = await HttpClient.ExecuteProxiedAsync(requestBuilder.Build(), Definition); } Cookies = loginResult.GetCookies(); @@ -466,7 +466,7 @@ public async Task DoLogin() requestBuilder.Headers.Add("Referer", SiteLink); - var response = await HttpClient.ExecuteAsync(requestBuilder.Build(), Definition); + var response = await HttpClient.ExecuteProxiedAsync(requestBuilder.Build(), Definition); Cookies = response.GetCookies(); @@ -490,7 +490,7 @@ public async Task DoLogin() requestBuilder.Headers.Add("Referer", SiteLink); - var response = await HttpClient.ExecuteAsync(requestBuilder.Build(), Definition); + var response = await HttpClient.ExecuteProxiedAsync(requestBuilder.Build(), Definition); Cookies = response.GetCookies(); @@ -569,7 +569,7 @@ public async Task GetConfigurationForSetup(bool automaticlogin) var request = requestBuilder.Build(); - landingResult = await HttpClient.ExecuteAsync(request, Definition); + landingResult = await HttpClient.ExecuteProxiedAsync(request, Definition); Cookies = landingResult.GetCookies(); @@ -613,7 +613,7 @@ private async Task GetCaptcha(LoginBlock login) .SetHeader("Referer", loginUrl.AbsoluteUri) .Build(); - var response = await HttpClient.ExecuteAsync(request, Definition); + var response = await HttpClient.ExecuteProxiedAsync(request, Definition); return new Captcha { @@ -703,7 +703,7 @@ protected async Task HandleRequest(RequestBlock request, Dictionar } } - var response = await HttpClient.ExecuteAsync(httpRequest.Build(), Definition); + var response = await HttpClient.ExecuteProxiedAsync(httpRequest.Build(), Definition); _logger.Debug($"CardigannIndexer ({_definition.Id}): handleRequest() remote server returned {response.StatusCode.ToString()}"); return response; @@ -743,7 +743,7 @@ public async Task DownloadRequest(Uri link) request.AllowAutoRedirect = true; - var response = await HttpClient.ExecuteAsync(request, Definition); + var response = await HttpClient.ExecuteProxiedAsync(request, Definition); var results = response.Content; var searchResultParser = new HtmlParser(); diff --git a/src/NzbDrone.Core/Indexers/Definitions/Headphones/Headphones.cs b/src/NzbDrone.Core/Indexers/Definitions/Headphones/Headphones.cs index 7b2980045..264aed562 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Headphones/Headphones.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Headphones/Headphones.cs @@ -63,7 +63,7 @@ public override async Task Download(Uri link) try { - var response = await _httpClient.ExecuteAsync(request, Definition); + var response = await _httpClient.ExecuteProxiedAsync(request, Definition); downloadBytes = response.ResponseData; } catch (Exception) diff --git a/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabCapabilitiesProvider.cs b/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabCapabilitiesProvider.cs index fe069c0bc..29911e7db 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabCapabilitiesProvider.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabCapabilitiesProvider.cs @@ -56,7 +56,7 @@ private IndexerCapabilities FetchCapabilities(NewznabSettings indexerSettings, P try { - response = _httpClient.Execute(request, definition); + response = _httpClient.ExecuteProxied(request, definition); } catch (Exception ex) { diff --git a/src/NzbDrone.Core/Indexers/Definitions/SpeedApp.cs b/src/NzbDrone.Core/Indexers/Definitions/SpeedApp.cs index 686a417a9..43d23d709 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/SpeedApp.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/SpeedApp.cs @@ -141,7 +141,7 @@ public override async Task Download(Uri link) try { - var response = await _httpClient.ExecuteAsync(request, Definition); + var response = await _httpClient.ExecuteProxiedAsync(request, Definition); torrentData = response.ResponseData; } catch (HttpException ex) diff --git a/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs b/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs index 5a7c87bad..377acd25e 100644 --- a/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs +++ b/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs @@ -379,7 +379,7 @@ protected virtual async Task FetchIndexerResponse(IndexerReques request.HttpRequest.SuppressHttpError = true; request.HttpRequest.Encoding = Encoding; - var response = await _httpClient.ExecuteAsync(request.HttpRequest, Definition); + var response = await _httpClient.ExecuteProxiedAsync(request.HttpRequest, Definition); // Check reponse to see if auth is needed, if needed try again if (CheckIfLoginNeeded(response)) @@ -391,7 +391,7 @@ protected virtual async Task FetchIndexerResponse(IndexerReques request.HttpRequest.Url = originalUrl; ModifyRequest(request); - response = await _httpClient.ExecuteAsync(request.HttpRequest, Definition); + response = await _httpClient.ExecuteProxiedAsync(request.HttpRequest, Definition); } // Throw common http errors here before we try to parse @@ -414,7 +414,7 @@ protected async Task ExecuteAuth(HttpRequest request) { request.Encoding = Encoding; - var response = await _httpClient.ExecuteAsync(request, Definition); + var response = await _httpClient.ExecuteProxiedAsync(request, Definition); _eventAggregator.PublishEvent(new IndexerAuthEvent(Definition.Id, !response.HasHttpError, response.ElapsedTime)); diff --git a/src/NzbDrone.Core/Indexers/IndexerHttpClient.cs b/src/NzbDrone.Core/Indexers/IndexerHttpClient.cs index 1558b139c..34e8715f4 100644 --- a/src/NzbDrone.Core/Indexers/IndexerHttpClient.cs +++ b/src/NzbDrone.Core/Indexers/IndexerHttpClient.cs @@ -14,8 +14,8 @@ namespace NzbDrone.Core.Indexers { public interface IIndexerHttpClient : IHttpClient { - Task ExecuteAsync(HttpRequest request, ProviderDefinition definition); - HttpResponse Execute(HttpRequest request, ProviderDefinition definition); + Task ExecuteProxiedAsync(HttpRequest request, ProviderDefinition definition); + HttpResponse ExecuteProxied(HttpRequest request, ProviderDefinition definition); } public class IndexerHttpClient : HttpClient, IIndexerHttpClient @@ -32,7 +32,7 @@ public IndexerHttpClient(IIndexerProxyFactory indexerProxyFactory, _indexerProxyFactory = indexerProxyFactory; } - public async Task ExecuteAsync(HttpRequest request, ProviderDefinition definition) + public async Task ExecuteProxiedAsync(HttpRequest request, ProviderDefinition definition) { var selectedProxy = GetProxy(definition); @@ -41,7 +41,7 @@ public async Task ExecuteAsync(HttpRequest request, ProviderDefini return PostResponse(await ExecuteAsync(request), selectedProxy); } - public HttpResponse Execute(HttpRequest request, ProviderDefinition definition) + public HttpResponse ExecuteProxied(HttpRequest request, ProviderDefinition definition) { var selectedProxy = GetProxy(definition); diff --git a/src/NzbDrone.Core/Indexers/TorrentIndexerBase.cs b/src/NzbDrone.Core/Indexers/TorrentIndexerBase.cs index 3275caade..451d001a7 100644 --- a/src/NzbDrone.Core/Indexers/TorrentIndexerBase.cs +++ b/src/NzbDrone.Core/Indexers/TorrentIndexerBase.cs @@ -43,7 +43,7 @@ public override async Task Download(Uri link) try { - var response = await _httpClient.ExecuteAsync(request, Definition); + var response = await _httpClient.ExecuteProxiedAsync(request, Definition); torrentData = response.ResponseData; } catch (HttpException ex) diff --git a/src/NzbDrone.Core/Indexers/UsenetIndexerBase.cs b/src/NzbDrone.Core/Indexers/UsenetIndexerBase.cs index 93c559e19..af3044c33 100644 --- a/src/NzbDrone.Core/Indexers/UsenetIndexerBase.cs +++ b/src/NzbDrone.Core/Indexers/UsenetIndexerBase.cs @@ -39,7 +39,7 @@ public override async Task Download(Uri link) try { - var response = await _httpClient.ExecuteAsync(request, Definition); + var response = await _httpClient.ExecuteProxiedAsync(request, Definition); nzbData = response.ResponseData; _logger.Debug("Downloaded nzb for release finished ({0} bytes from {1})", nzbData.Length, link.AbsoluteUri);