From 9cc3646be5deef013b70c31e09931598e8621a31 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Wed, 9 Oct 2024 00:50:40 +0300 Subject: [PATCH] Fixed: (Cardigann) Using variables in login paths --- .../Cardigann/CardigannRequestGenerator.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs index da9d7b415..11c8060ab 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs @@ -212,7 +212,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann } } - var loginUrl = ResolvePath(login.Path).ToString(); + var loginUrl = ResolvePath(ApplyGoTemplateText(login.Path, variables)).ToString(); CookiesUpdater(null, null); @@ -253,7 +253,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann } else if (login.Method == "form") { - var loginUrl = ResolvePath(login.Path).ToString(); + var loginUrl = ResolvePath(ApplyGoTemplateText(login.Path, variables)).ToString(); var queryCollection = new NameValueCollection(); var pairs = new Dictionary(); @@ -534,7 +534,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann } } - var loginUrl = ResolvePath(login.Path + "?" + queryCollection.GetQueryString()).ToString(); + var loginUrl = ResolvePath(ApplyGoTemplateText(login.Path, variables) + "?" + queryCollection.GetQueryString()).ToString(); CookiesUpdater(null, null); @@ -563,7 +563,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann else if (login.Method == "oneurl") { var oneUrl = ApplyGoTemplateText(login.Inputs["oneurl"]); - var loginUrl = ResolvePath(login.Path + oneUrl).ToString(); + var loginUrl = ResolvePath(ApplyGoTemplateText(login.Path, variables) + oneUrl).ToString(); CookiesUpdater(null, null); @@ -639,7 +639,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann var variables = GetBaseTemplateVariables(); var headers = ParseCustomHeaders(_definition.Login?.Headers ?? _definition.Search?.Headers, variables); - var loginUrl = ResolvePath(login.Path); + var loginUrl = ResolvePath(ApplyGoTemplateText(login.Path, variables)); var requestBuilder = new HttpRequestBuilder(loginUrl.AbsoluteUri) { @@ -700,7 +700,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann var captchaElement = landingResultDocument.QuerySelector(captcha.Selector); if (captchaElement != null) { - var loginUrl = ResolvePath(login.Path); + var loginUrl = ResolvePath(ApplyGoTemplateText(login.Path, variables)); var captchaUrl = ResolvePath(captchaElement.GetAttribute("src"), loginUrl); var request = new HttpRequestBuilder(captchaUrl.ToString())