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

polishtracker: display email on login config. resolves #4780

Browse Source
This commit is contained in:
Garfield69
2019-02-28 07:41:53 +13:00
parent f9ad475aa8
commit 05c4d1e331
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Jackett.Common/Indexers/PolishTracker.cs
View File

@@ -23,9 +23,9 @@ namespace Jackett.Common.Indexers
"https://polishtracker.net/", "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; } set { base.configData = value; }
} }
@@ -38,7 +38,7 @@ namespace Jackett.Common.Indexers
client: wc, client: wc,
logger: l, logger: l,
p: ps, p: ps,
configData: new ConfigurationDataBasicLoginWithRSSAndDisplay()) configData: new ConfigurationDataBasicLoginWithEmail())
{ {
Encoding = Encoding.UTF8; Encoding = Encoding.UTF8;
Language = "pl-pl"; Language = "pl-pl";
@@ -64,7 +64,7 @@ Encoding = Encoding.UTF8;
var pairs = new Dictionary<string, string> var pairs = new Dictionary<string, string>
{ {
{ "email", configData.Username.Value }, { "email", configData.Email.Value },
{ "pass", configData.Password.Value } { "pass", configData.Password.Value }
}; };
var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, SiteLink); 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="), () => await ConfigureIfOK(result.Cookies, result.Cookies != null && result.Cookies.Contains("id="), () =>
{ {
var errorMessage = result.Content; var errorMessage = result.Content;
if (errorMessage.Contains("Error!"))
errorMessage = "E-mail or password is incorrect";
throw new ExceptionWithConfigData(errorMessage, configData); throw new ExceptionWithConfigData(errorMessage, configData);
}); });
return IndexerConfigurationStatus.RequiresTesting; return IndexerConfigurationStatus.RequiresTesting;

18
src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithEmail.cs Normal file
View File

@@ -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 = "" };
}
}
}