core: refactor http webclient part 13 #8529 (#8941)

Merge string/byte request code
This commit is contained in:
Cory
2020-06-11 10:09:27 -05:00
committed by ngosang
parent 67c7b4ca70
commit ac0ba0f9b1
91 changed files with 330 additions and 399 deletions

View File

@@ -9,6 +9,7 @@ using AngleSharp.Html.Parser;
using Jackett.Common.Models;
using Jackett.Common.Models.IndexerConfig;
using Jackett.Common.Services.Interfaces;
using Jackett.Common.Utils.Clients;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NLog;
@@ -85,7 +86,7 @@ namespace Jackett.Common.Indexers
for (var page = 0; page < maxPages; page++)
{
var searchUrl = string.Format(SearchUrl, page * MaxItemsPerPage, searchString);
var result = await RequestStringWithCookies(searchUrl, null, null, _apiHeaders);
var result = await WebRequestWithCookiesAsync(searchUrl, headers: _apiHeaders);
try
{
@@ -149,7 +150,7 @@ namespace Jackett.Common.Indexers
public override async Task<byte[]> Download(Uri link)
{
var result = await RequestStringWithCookiesAndRetry(link.AbsoluteUri);
var result = await RequestWithCookiesAndRetryAsync(link.AbsoluteUri);
if (SobrecargaUrl.Equals(result.RedirectingTo))
throw new Exception("El servidor se encuentra sobrecargado en estos momentos. / The server is currently overloaded.");
try