shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-17 17:14:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set Cardigann defaults on definition load

Browse Source
This commit is contained in:
Qstick
2021-02-22 22:19:37 -05:00
parent bdcf34aab4
commit ab68c8b5b5
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs
View File

@@ -110,6 +110,22 @@ namespace NzbDrone.Core.IndexerVersions
{
var definitionString = File.ReadAllText(file.FullName);
var definition = _deserializer.Deserialize<CardigannDefinition>(definitionString);
//defaults
if (definition.Settings == null)
{
definition.Settings = new List<SettingsField>
{
new SettingsField { Name = "username", Label = "Username", Type = "text" },
new SettingsField { Name = "password", Label = "Password", Type = "password" }
};
}
if (definition.Login != null && definition.Login.Method == null)
{
definition.Login.Method = "form";
}
return definition;
}
catch (Exception e)

10
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs
View File

@@ -216,15 +216,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
_logger.Debug("Populating config vars");
var defaultSettings = new List<SettingsField>
{
new SettingsField { Name = "username", Label = "Username", Type = "text" },
new SettingsField { Name = "password", Label = "Password", Type = "password" }
};
var settings = _definition.Settings ?? defaultSettings;
foreach (var setting in settings)
foreach (var setting in _definition.Settings)
{
var name = ".Config." + setting.Name;
var value = _settings.ExtraFieldData.GetValueOrDefault(setting.Name, setting.Default);

1
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
View File

@@ -882,6 +882,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
}
request.HttpRequest.Method = method;
request.HttpRequest.SuppressHttpError = true;
yield return request;
}