From e6f8109749bdab4bc11d951c0d346ab4dbf44bcd Mon Sep 17 00:00:00 2001 From: kaso17 Date: Tue, 12 Dec 2017 16:01:26 +0100 Subject: [PATCH] Cardigann: add support for download/filters --- src/Jackett.Common/Indexers/CardigannIndexer.cs | 7 ++++--- src/Jackett.Common/Models/IndexerDefinition.cs | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs index 593f97576..6d34feef1 100644 --- a/src/Jackett.Common/Indexers/CardigannIndexer.cs +++ b/src/Jackett.Common/Indexers/CardigannIndexer.cs @@ -1497,11 +1497,11 @@ namespace Jackett.Indexers if (Definition.Download != null) { var Download = Definition.Download; + var variables = getTemplateVariablesFromConfigData(); + AddTemplateVariablesFromUri(variables, link, ".DownloadUri"); if (Download.Before != null) { - var beforeVariables = getTemplateVariablesFromConfigData(); - AddTemplateVariablesFromUri(beforeVariables, link, ".DownloadUri"); - var beforeresult = await handleRequest(Download.Before, beforeVariables, link.ToString()); + var beforeresult = await handleRequest(Download.Before, variables, link.ToString()); } 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())); var href = DlUri.GetAttribute("href"); + href = applyFilters(href, Download.Filters, variables); link = resolvePath(href); } else diff --git a/src/Jackett.Common/Models/IndexerDefinition.cs b/src/Jackett.Common/Models/IndexerDefinition.cs index 211637049..7574c84ed 100644 --- a/src/Jackett.Common/Models/IndexerDefinition.cs +++ b/src/Jackett.Common/Models/IndexerDefinition.cs @@ -193,6 +193,7 @@ namespace Jackett.Models public class downloadBlock { public string Selector { get; set; } + public List Filters { get; set; } public string Method { get; set; } public requestBlock Before { get; set; } }