diff --git a/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj index c792eca5120..dbfd068614b 100644 --- a/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs b/src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs index 6b2c4dc9116..4100934a00c 100644 --- a/src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs +++ b/src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs @@ -137,11 +137,11 @@ private List ReadDefinitionsFromDisk(List ReadDefinitionsFromDisk(List 0 && !dbDefs.Any(x => x.File == fileKey)) + if (dbDefs.Count > 0 && dbDefs.All(x => x.File != fileKey)) { throw new ArgumentNullException(nameof(fileKey)); } @@ -217,9 +218,10 @@ private CardigannDefinition GetUncachedDefinition(string fileKey) private CardigannDefinition GetHttpDefinition(string id) { - var req = new HttpRequest($"https://indexers.prowlarr.com/{DEFINITION_BRANCH}/{DEFINITION_VERSION}/{id}"); - var response = _httpClient.Get(req); + var request = new HttpRequest($"https://indexers.prowlarr.com/{DEFINITION_BRANCH}/{DEFINITION_VERSION}/{id}"); + var response = _httpClient.Get(request); var definition = _deserializer.Deserialize(response.Content); + return CleanIndexerDefinition(definition); } @@ -289,7 +291,7 @@ private void UpdateLocalDefinitions() EnsureDefinitionsFolder(); var definitionsFolder = Path.Combine(startupFolder, "Definitions"); - var saveFile = Path.Combine(definitionsFolder, $"indexers.zip"); + var saveFile = Path.Combine(definitionsFolder, "indexers.zip"); _httpClient.DownloadFile($"https://indexers.prowlarr.com/{DEFINITION_BRANCH}/{DEFINITION_VERSION}/package.zip", saveFile); diff --git a/src/NzbDrone.Core/Indexers/IndexerFactory.cs b/src/NzbDrone.Core/Indexers/IndexerFactory.cs index 53c2c283862..a5f4e6601a1 100644 --- a/src/NzbDrone.Core/Indexers/IndexerFactory.cs +++ b/src/NzbDrone.Core/Indexers/IndexerFactory.cs @@ -55,10 +55,10 @@ public override List All() { MapCardigannDefinition(definition); } - catch + catch (Exception ex) { // Skip indexer if we fail in Cardigann mapping - _logger.Debug("Indexer '{0}' has no definition", definition.Name); + _logger.Debug(ex, "Indexer '{0}' has no definition", definition.Name); } } diff --git a/src/NzbDrone.Core/Prowlarr.Core.csproj b/src/NzbDrone.Core/Prowlarr.Core.csproj index 4645bc246c9..b9ab1d82677 100644 --- a/src/NzbDrone.Core/Prowlarr.Core.csproj +++ b/src/NzbDrone.Core/Prowlarr.Core.csproj @@ -21,7 +21,7 @@ - +