mirror/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2024-12-22 07:43:01 +00:00
Code Issues Releases Wiki Activity

Fixed: Series without tags bypassing tags on Download Client

Browse source 
Closes #7474
This commit is contained in:
Mark McDowall 2024-12-10 19:22:58 -08:00
parent 811eb36c7b
commit c0e264cfc5
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/NzbDrone.Core/Download/DownloadClientProvider.cs
View file

@ -38,6 +38,10 @@ namespace NzbDrone.Core.Download
public IDownloadClient GetDownloadClient(DownloadProtocol downloadProtocol, int indexerId = 0, bool filterBlockedClients = false, HashSet<int> tags = null) public IDownloadClient GetDownloadClient(DownloadProtocol downloadProtocol, int indexerId = 0, bool filterBlockedClients = false, HashSet<int> tags = null)
{ {
// Tags aren't required, but indexers with tags should not be picked unless there is at least one matching tag.
// Defaulting to an empty HashSet ensures this is always checked.
tags ??= new HashSet<int>();
var blockedProviders = new HashSet<int>(_downloadClientStatusService.GetBlockedProviders().Select(v => v.ProviderId)); var blockedProviders = new HashSet<int>(_downloadClientStatusService.GetBlockedProviders().Select(v => v.ProviderId));
var availableProviders = _downloadClientFactory.GetAvailableProviders().Where(v => v.Protocol == downloadProtocol).ToList(); var availableProviders = _downloadClientFactory.GetAvailableProviders().Where(v => v.Protocol == downloadProtocol).ToList();
@ -46,18 +50,15 @@ namespace NzbDrone.Core.Download
return null; return null;
} }
if (tags is { Count: > 0 }) var matchingTagsClients = availableProviders.Where(i => i.Definition.Tags.Intersect(tags).Any()).ToList();
availableProviders = matchingTagsClients.Count > 0 ?
matchingTagsClients :
availableProviders.Where(i => i.Definition.Tags.Empty()).ToList();
if (!availableProviders.Any())
{ {
var matchingTagsClients = availableProviders.Where(i => i.Definition.Tags.Intersect(tags).Any()).ToList(); throw new DownloadClientUnavailableException("No download client was found without tags or a matching series tag. Please check your settings.");
availableProviders = matchingTagsClients.Count > 0 ?
matchingTagsClients :
availableProviders.Where(i => i.Definition.Tags.Empty()).ToList();
if (!availableProviders.Any())
{
throw new DownloadClientUnavailableException("No download client was found without tags or a matching series tag. Please check your settings.");
}
} }
if (indexerId > 0) if (indexerId > 0)