Backup_Repos/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr synced 2026-05-08 21:13:58 +02:00
Code Issues Projects Releases Wiki Activity

Improve message for grab errors due to no matching tags

Browse source 
Co-authored-by: zakary <zak@ary.dev>
(cherry picked from commit df672487cf1d5f067849367a2bfb0068defc315d)

Closes #3814
This commit is contained in:
Bogdan 2024-10-18 05:45:03 +03:00
parent cb532caca4
commit e0d904fa69
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/NzbDrone.Core.Test/Download/DownloadClientProviderFixture.cs
View file

@ -200,17 +200,9 @@ public void should_fail_to_choose_when_clients_have_tags_but_no_match()
var seriesTags = new HashSet<int> { 2 }; var seriesTags = new HashSet<int> { 2 };
var clientTags = new HashSet<int> { 1 }; var clientTags = new HashSet<int> { 1 };
WithTorrentClient(0, clientTags);
WithTorrentClient(0, clientTags);
WithTorrentClient(0, clientTags);
WithTorrentClient(0, clientTags); WithTorrentClient(0, clientTags);
var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags); Assert.Throws<DownloadClientUnavailableException>(() => Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags));
var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags).Should().BeNull();
} }
[Test] [Test]

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

@ -41,18 +41,23 @@ public IDownloadClient GetDownloadClient(DownloadProtocol downloadProtocol, 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();
if (tags != null) if (!availableProviders.Any())
{
return null;
}
if (tags is { Count: > 0 })
{ {
var matchingTagsClients = availableProviders.Where(i => i.Definition.Tags.Intersect(tags).Any()).ToList(); var matchingTagsClients = availableProviders.Where(i => i.Definition.Tags.Intersect(tags).Any()).ToList();
availableProviders = matchingTagsClients.Count > 0 ? availableProviders = matchingTagsClients.Count > 0 ?
matchingTagsClients : matchingTagsClients :
availableProviders.Where(i => i.Definition.Tags.Empty()).ToList(); availableProviders.Where(i => i.Definition.Tags.Empty()).ToList();
}
if (!availableProviders.Any()) if (!availableProviders.Any())
{ {
return null; throw new DownloadClientUnavailableException("No download client was found without tags or a matching author tag. Please check your settings.");
}
} }
if (indexerId > 0) if (indexerId > 0)