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

Core: rewrite of configuration items. Resolves #2114 (#11104)

Browse Source
This commit is contained in:
XYZJR
2021-03-17 00:29:26 +01:00
committed by GitHub
parent a6617ed663
commit eaf0513605
56 changed files with 693 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Jackett.Common/Indexers/BaseIndexer.cs
View File

@@ -182,17 +182,17 @@ namespace Jackett.Common.Indexers
LoadValuesFromJson(jsonConfig, false);
StringItem passwordPropertyValue = null;
StringConfigurationItem passwordPropertyValue = null;
var passwordValue = "";
try
{
// try dynamic items first (e.g. all cardigann indexers)
passwordPropertyValue = (StringItem)configData.GetDynamicByName("password");
passwordPropertyValue = (StringConfigurationItem)configData.GetDynamicByName("password");
if (passwordPropertyValue == null) // if there's no dynamic password try the static property
{
passwordPropertyValue = (StringItem)configData.GetType().GetProperty("Password").GetValue(configData, null);
passwordPropertyValue = (StringConfigurationItem)configData.GetType().GetProperty("Password").GetValue(configData, null);
// protection is based on the item.Name value (property name might be different, example: Abnormal), so check the Name again
if (!string.Equals(passwordPropertyValue.Name, "password", StringComparison.InvariantCultureIgnoreCase))
@@ -433,9 +433,9 @@ namespace Jackett.Common.Indexers
return DefaultNumberOfRetryAttempts;
}
var configValue = ((SelectItem)configItem).Value;
var configValue = ((SingleSelectConfigurationItem)configItem).Value;
if (int.TryParse(configValue, out int parsedConfigValue) && parsedConfigValue > 0)
if (int.TryParse(configValue, out var parsedConfigValue) && parsedConfigValue > 0)
{
return parsedConfigValue;
}
@@ -476,7 +476,8 @@ namespace Jackett.Common.Indexers
/// </remarks>
protected void EnableConfigurableRetryAttempts()
{
var attemptSelect = new SelectItem(
var attemptSelect = new SingleSelectConfigurationItem(
"Number of retries",
new Dictionary<string, string>
{
{"0", "No retries (fail fast)"},
@@ -487,7 +488,6 @@ namespace Jackett.Common.Indexers
{"5", "5 retries (8s delay)"}
})
{
Name = "Number of retries",
Value = DefaultNumberOfRetryAttempts.ToString()
};
configData.AddDynamic("retryAttempts", attemptSelect);