github-mirrors/prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-04-24 05:47:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: Don't fetch capabilities for disabled Newznab/Torznab indexers on create

Browse source 
Also prevent NullRef in GetProxy since definition is null when using FetchCapabilities on add
This commit is contained in:
Bogdan 2023-08-02 14:54:01 +03:00
parent d897b50f80
commit bc53fab966
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/NzbDrone.Core/Indexers/IndexerFactory.cs
View file

@ -281,10 +281,10 @@ namespace NzbDrone.Core.Indexers
SetProviderCharacteristics(provider, definition);
if (definition.Implementation is nameof(Newznab.Newznab) or nameof(Torznab.Torznab))
if (definition.Enable && definition.Implementation is nameof(Newznab.Newznab) or nameof(Torznab.Torznab))
{
var settings = (NewznabSettings)definition.Settings;
settings.Categories = _newznabCapabilitiesProvider.GetCapabilities(settings, definition)?.Categories.GetTorznabCategoryList() ?? null;
settings.Categories = _newznabCapabilitiesProvider.GetCapabilities(settings, definition)?.Categories.GetTorznabCategoryList();
}
if (definition.Implementation == nameof(Cardigann))
@ -304,7 +304,7 @@ namespace NzbDrone.Core.Indexers
if (definition.Enable && definition.Implementation is nameof(Newznab.Newznab) or nameof(Torznab.Torznab))
{
var settings = (NewznabSettings)definition.Settings;
settings.Categories = _newznabCapabilitiesProvider.GetCapabilities(settings, definition)?.Categories.GetTorznabCategoryList() ?? null;
settings.Categories = _newznabCapabilitiesProvider.GetCapabilities(settings, definition)?.Categories.GetTorznabCategoryList();
}
if (definition.Implementation == nameof(Cardigann))

4
src/NzbDrone.Core/Indexers/IndexerHttpClient.cs
View file

@ -53,7 +53,7 @@ namespace NzbDrone.Core.Indexers
private IIndexerProxy GetProxy(ProviderDefinition definition)
{
// Skip DB call if no tags on the indexers
if (definition.Tags.Count == 0 && definition.Id > 0)
if (definition is { Id: > 0 } && definition.Tags.Count == 0)
{
return null;
}
@ -61,7 +61,7 @@ namespace NzbDrone.Core.Indexers
var proxies = _indexerProxyFactory.GetAvailableProviders();
var selectedProxy = proxies.FirstOrDefault(proxy => definition.Tags.Intersect(proxy.Definition.Tags).Any());
if (selectedProxy == null && definition.Id == 0)
if (selectedProxy == null && definition is not { Id: not 0 })
{
selectedProxy = proxies.FirstOrDefault(p => p is FlareSolverr);
}