mirror/Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett synced 2024-12-28 10:50:47 +00:00
Code Issues Releases Wiki Activity

Cardigann: improve domain change error handling

Browse source
This commit is contained in:
kaso17 2018-01-22 17:35:56 +01:00
parent dd9a6c1c7b
commit f89c9769be
1 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/Jackett.Common/Indexers/CardigannIndexer.cs
View file

@ -639,6 +639,26 @@ namespace Jackett.Indexers
return true; return true;
} }
protected string getRedirectDomainHint(string requestUrl, string RedirectUrl)
{
if (requestUrl.StartsWith(SiteLink) && !RedirectUrl.StartsWith(SiteLink))
{
var uri = new Uri(RedirectUrl);
return uri.Scheme + "://" + uri.Host + "/";
}
return null;
}
protected string getRedirectDomainHint(WebClientByteResult result)
{
return getRedirectDomainHint(result.Request.Url, result.RedirectingTo);
}
protected string getRedirectDomainHint(WebClientStringResult result)
{
return getRedirectDomainHint(result.Request.Url, result.RedirectingTo);
}
protected async Task<bool> TestLogin() protected async Task<bool> TestLogin()
{ {
var Login = Definition.Login; var Login = Definition.Login;
@ -652,7 +672,11 @@ namespace Jackett.Indexers
if (testResult.IsRedirect) if (testResult.IsRedirect)
{ {
throw new ExceptionWithConfigData("Login Failed, got redirected", configData); var errormessage = "Login Failed, got redirected.";
var DomainHint = getRedirectDomainHint(testResult);
if (DomainHint != null)
errormessage += " Try changing the indexer URL to " + DomainHint + ".";
throw new ExceptionWithConfigData(errormessage, configData);
} }
if (Login.Test.Selector != null) if (Login.Test.Selector != null)
@ -672,6 +696,13 @@ namespace Jackett.Indexers
{ {
if (Result.IsRedirect) if (Result.IsRedirect)
{ {
var DomainHint = getRedirectDomainHint(Result);
if (DomainHint != null)
{
var errormessage = "Got redirected to another domain. Try changing the indexer URL to " + DomainHint + ".";
throw new ExceptionWithConfigData(errormessage, configData);
}
return true; return true;
} }