shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "core: refactor http webclient part 2 #8529 (#7654)"

Browse Source 
This reverts commit 7c071b32ee.
This commit is contained in:
ngosang
2020-09-21 08:04:21 +02:00
parent e4d384158a
commit 9c492c5dcb
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Jackett.Common/Indexers/BaseIndexer.cs
View File

@@ -584,7 +584,17 @@ namespace Jackett.Common.Indexers
} }
} }
protected async Task FollowIfRedirect(BaseWebResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false) protected async Task FollowIfRedirect(WebClientStringResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false)
{
var byteResult = new WebClientByteResult();
// Map to byte
Mapper.Map(response, byteResult);
await FollowIfRedirect(byteResult, referrer, overrideRedirectUrl, overrideCookies, accumulateCookies);
// Map to string
Mapper.Map(byteResult, response);
}
protected async Task FollowIfRedirect(WebClientByteResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false)
{ {
// Follow up to 5 redirects // Follow up to 5 redirects
for (var i = 0; i < 5; i++) for (var i = 0; i < 5; i++)
@@ -629,7 +639,7 @@ namespace Jackett.Common.Indexers
} }
} }
private async Task DoFollowIfRedirect(BaseWebResult incomingResponse, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false) private async Task DoFollowIfRedirect(WebClientByteResult incomingResponse, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false)
{ {
if (incomingResponse.IsRedirect) if (incomingResponse.IsRedirect)
{ {

6
src/Jackett.Common/Indexers/CardigannIndexer.cs
View File

@@ -782,7 +782,9 @@ namespace Jackett.Common.Indexers
return null; return null;
} }
protected string getRedirectDomainHint(BaseWebResult result) => getRedirectDomainHint(result.Request.Url, result.RedirectingTo); protected string getRedirectDomainHint(WebClientByteResult result) => getRedirectDomainHint(result.Request.Url, result.RedirectingTo);
protected string getRedirectDomainHint(WebClientStringResult result) => getRedirectDomainHint(result.Request.Url, result.RedirectingTo);
protected async Task<bool> TestLogin() protected async Task<bool> TestLogin()
{ {
@@ -826,7 +828,7 @@ namespace Jackett.Common.Indexers
return true; return true;
} }
protected bool CheckIfLoginIsNeeded(BaseWebResult Result, IHtmlDocument document) protected bool CheckIfLoginIsNeeded(WebClientStringResult Result, IHtmlDocument document)
{ {
if (Result.IsRedirect) if (Result.IsRedirect)
{ {