mirror/Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett synced 2025-03-10 06:03:09 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
Use base class when not looking at content variable
This commit is contained in:
Cory 2020-03-14 17:20:32 -05:00 • committed by ngosang
parent 0bdcfd1e7b
commit 7c071b32ee
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -584,17 +584,7 @@ namespace Jackett.Common.Indexers
} }
} }
protected async Task FollowIfRedirect(WebClientStringResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false) protected async Task FollowIfRedirect(BaseWebResult 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++)
@ -639,7 +629,7 @@ namespace Jackett.Common.Indexers
} }
} }
private async Task DoFollowIfRedirect(WebClientByteResult incomingResponse, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false) private async Task DoFollowIfRedirect(BaseWebResult 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,9 +782,7 @@ namespace Jackett.Common.Indexers
return null; return null;
} }
protected string getRedirectDomainHint(WebClientByteResult result) => getRedirectDomainHint(result.Request.Url, result.RedirectingTo); protected string getRedirectDomainHint(BaseWebResult 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()
{ {
@ -828,7 +826,7 @@ namespace Jackett.Common.Indexers
return true; return true;
} }
protected bool CheckIfLoginIsNeeded(WebClientStringResult Result, IHtmlDocument document) protected bool CheckIfLoginIsNeeded(BaseWebResult Result, IHtmlDocument document)
{ {
if (Result.IsRedirect) if (Result.IsRedirect)
{ {