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

Cardigann: add support for download/filters

Browse Source
This commit is contained in:
kaso17
2017-12-12 16:01:26 +01:00
parent b4f4ed5fe0
commit e6f8109749
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1497,11 +1497,11 @@ namespace Jackett.Indexers
if (Definition.Download != null) if (Definition.Download != null)
{ {
var Download = Definition.Download; var Download = Definition.Download;
var variables = getTemplateVariablesFromConfigData();
AddTemplateVariablesFromUri(variables, link, ".DownloadUri");
if (Download.Before != null) if (Download.Before != null)
{ {
var beforeVariables = getTemplateVariablesFromConfigData(); var beforeresult = await handleRequest(Download.Before, variables, link.ToString());
AddTemplateVariablesFromUri(beforeVariables, link, ".DownloadUri");
var beforeresult = await handleRequest(Download.Before, beforeVariables, link.ToString());
} }
if (Download.Method != null) if (Download.Method != null)
{ {
@@ -1521,6 +1521,7 @@ namespace Jackett.Indexers
{ {
logger.Debug(string.Format("CardigannIndexer ({0}): Download selector {1} matched:{2}", ID, Download.Selector, DlUri.ToHtmlPretty())); logger.Debug(string.Format("CardigannIndexer ({0}): Download selector {1} matched:{2}", ID, Download.Selector, DlUri.ToHtmlPretty()));
var href = DlUri.GetAttribute("href"); var href = DlUri.GetAttribute("href");
href = applyFilters(href, Download.Filters, variables);
link = resolvePath(href); link = resolvePath(href);
} }
else else

1
src/Jackett.Common/Models/IndexerDefinition.cs
View File

@@ -193,6 +193,7 @@ namespace Jackett.Models
public class downloadBlock public class downloadBlock
{ {
public string Selector { get; set; } public string Selector { get; set; }
public List<filterBlock> Filters { get; set; }
public string Method { get; set; } public string Method { get; set; }
public requestBlock Before { get; set; } public requestBlock Before { get; set; }
} }