From 05c4d1e331b59c72e8c8b5299174f48c4fc4414c Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Thu, 28 Feb 2019 07:41:53 +1300 Subject: [PATCH] polishtracker: display email on login config. resolves #4780 --- src/Jackett.Common/Indexers/PolishTracker.cs | 10 ++++++---- .../ConfigurationDataBasicLoginWithEmail.cs | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithEmail.cs diff --git a/src/Jackett.Common/Indexers/PolishTracker.cs b/src/Jackett.Common/Indexers/PolishTracker.cs index 3e77e8da4..b10c4a4e3 100644 --- a/src/Jackett.Common/Indexers/PolishTracker.cs +++ b/src/Jackett.Common/Indexers/PolishTracker.cs @@ -23,9 +23,9 @@ namespace Jackett.Common.Indexers "https://polishtracker.net/", }; - private new ConfigurationDataBasicLoginWithRSSAndDisplay configData + private new ConfigurationDataBasicLoginWithEmail configData { - get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; } + get { return (ConfigurationDataBasicLoginWithEmail)base.configData; } set { base.configData = value; } } @@ -38,7 +38,7 @@ namespace Jackett.Common.Indexers client: wc, logger: l, p: ps, - configData: new ConfigurationDataBasicLoginWithRSSAndDisplay()) + configData: new ConfigurationDataBasicLoginWithEmail()) { Encoding = Encoding.UTF8; Language = "pl-pl"; @@ -64,7 +64,7 @@ Encoding = Encoding.UTF8; var pairs = new Dictionary { - { "email", configData.Username.Value }, + { "email", configData.Email.Value }, { "pass", configData.Password.Value } }; var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, SiteLink); @@ -72,6 +72,8 @@ Encoding = Encoding.UTF8; await ConfigureIfOK(result.Cookies, result.Cookies != null && result.Cookies.Contains("id="), () => { var errorMessage = result.Content; + if (errorMessage.Contains("Error!")) + errorMessage = "E-mail or password is incorrect"; throw new ExceptionWithConfigData(errorMessage, configData); }); return IndexerConfigurationStatus.RequiresTesting; diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithEmail.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithEmail.cs new file mode 100644 index 000000000..885144cfe --- /dev/null +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithEmail.cs @@ -0,0 +1,18 @@ +namespace Jackett.Common.Models.IndexerConfig +{ + public class ConfigurationDataBasicLoginWithEmail : ConfigurationData + { + public StringItem Email { get; private set; } + public StringItem Password { get; private set; } + public DisplayItem Instructions { get; private set; } + + public ConfigurationDataBasicLoginWithEmail(string instructionMessageOptional = null) + { + Email = new StringItem { Name = "Email" }; + Password = new StringItem { Name = "Password" }; + Instructions = new DisplayItem(instructionMessageOptional) { Name = "" }; + } + + + } +}