mirror
/
Jackett
mirror of https://github.com/Jackett/Jackett
1
0
Fork 0
Code Issues Releases Wiki Activity

core: cardigann add headers in test and download requests (#10590) 

* Allow GoTemplates in search.headers
* Send search.headers in login.test and download requests
This commit is contained in:
Diego Heras 2020-12-20 19:56:19 +01:00 committed by GitHub
parent 16aed6f729
commit de8f36bf8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -746,7 +746,8 @@ namespace Jackett.Common.Indexers
// test if login was successful
var LoginTestUrl = resolvePath(Login.Test.Path).ToString();
var testResult = await RequestWithCookiesAsync(LoginTestUrl);
var headers = ParseCustomHeaders(Definition.Search?.Headers, GetBaseTemplateVariables());
var testResult = await RequestWithCookiesAsync(LoginTestUrl, headers: headers);
if (testResult.IsRedirect)
{
@ -1265,16 +1266,8 @@ namespace Jackett.Common.Indexers
}
var searchUrlUri = new Uri(searchUrl);
// send HTTP request
Dictionary<string, string> headers = null;
if (Search.Headers != null)
{
// FIXME: fix jackett header handling (allow it to specifiy the same header multipe times)
headers = new Dictionary<string, string>();
foreach (var header in Search.Headers)
headers.Add(header.Key, header.Value[0]);
}
// send HTTP request
var headers = ParseCustomHeaders(Search.Headers, variables);
var response = await RequestWithCookiesAsync(
searchUrl, method: method, headers: headers, data: queryCollection);
@ -1708,9 +1701,10 @@ namespace Jackett.Common.Indexers
if (Download.Selector != null)
{
var selector = applyGoTemplateText(Download.Selector, variables);
var response = await RequestWithCookiesAsync(link.ToString());
var headers = ParseCustomHeaders(Definition.Search?.Headers, variables);
var response = await RequestWithCookiesAsync(link.ToString(), headers: headers);
if (response.IsRedirect)
response = await RequestWithCookiesAsync(response.RedirectingTo);
response = await RequestWithCookiesAsync(response.RedirectingTo, headers: headers);
var results = response.ContentString;
var searchResultParser = new HtmlParser();
var searchResultDocument = searchResultParser.ParseDocument(results);
@ -1741,6 +1735,20 @@ namespace Jackett.Common.Indexers
}
return await base.Download(link, method, link.ToString());
}
private Dictionary<string, string> ParseCustomHeaders(Dictionary<string, List<string>> customHeaders,
Dictionary<string,object> variables)
{
if (customHeaders == null)
return null;
// FIXME: fix jackett header handling (allow it to specifiy the same header multipe times)
var headers = new Dictionary<string, string>();
foreach (var header in customHeaders)
headers.Add(header.Key, applyGoTemplateText(header.Value[0], variables));
return headers;
}
}
}