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

Fixed: Normalize definitions when serving local and remote

Browse Source
This commit is contained in:
Qstick
2021-06-04 19:27:21 -04:00
parent f062fafe82
commit cf1c44ed75
1 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,8 @@ namespace NzbDrone.Core.IndexerVersions
{ {
var req = new HttpRequest($"https://indexers.prowlarr.com/master/{DEFINITION_VERSION}/{id}"); var req = new HttpRequest($"https://indexers.prowlarr.com/master/{DEFINITION_VERSION}/{id}");
var response = _httpClient.Get(req); var response = _httpClient.Get(req);
return _deserializer.Deserialize<CardigannDefinition>(response.Content); var definition = _deserializer.Deserialize<CardigannDefinition>(response.Content);
return CleanIndexerDefinition(definition);
} }
private CardigannDefinition LoadIndexerDef(string fileKey) private CardigannDefinition LoadIndexerDef(string fileKey)
@@ -118,7 +119,20 @@ namespace NzbDrone.Core.IndexerVersions
var definitionString = File.ReadAllText(file.FullName); var definitionString = File.ReadAllText(file.FullName);
var definition = _deserializer.Deserialize<CardigannDefinition>(definitionString); var definition = _deserializer.Deserialize<CardigannDefinition>(definitionString);
//defaults return CleanIndexerDefinition(definition);
}
catch (Exception e)
{
_logger.Error($"Error while parsing Cardigann definition {file.FullName}\n{e}");
}
}
}
return GetHttpDefinition(fileKey);
}
private CardigannDefinition CleanIndexerDefinition(CardigannDefinition definition)
{
if (definition.Settings == null) if (definition.Settings == null)
{ {
definition.Settings = new List<SettingsField> definition.Settings = new List<SettingsField>
@@ -155,15 +169,6 @@ namespace NzbDrone.Core.IndexerVersions
return definition; return definition;
} }
catch (Exception e)
{
_logger.Error($"Error while parsing Cardigann definition {file.FullName}\n{e}");
}
}
}
return GetHttpDefinition(fileKey);
}
public void Execute(IndexerDefinitionUpdateCommand message) public void Execute(IndexerDefinitionUpdateCommand message)
{ {