mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Improve torrent blocklist matching

This commit is contained in:
Bogdan 2024-01-12 02:39:27 +02:00 committed by GitHub
parent 53f6f64448
commit b8964f8bba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/NzbDrone.Core/Blocklisting/BlocklistService.cs
View File

@ -36,30 +36,28 @@ namespace NzbDrone.Core.Blocklisting
public bool Blocklisted(int seriesId, ReleaseInfo release) public bool Blocklisted(int seriesId, ReleaseInfo release)
{ {
var blocklistedByTitle = _blocklistRepository.BlocklistedByTitle(seriesId, release.Title);
if (release.DownloadProtocol == DownloadProtocol.Torrent) if (release.DownloadProtocol == DownloadProtocol.Torrent)
{ {
var torrentInfo = release as TorrentInfo; if (release is not TorrentInfo torrentInfo)
if (torrentInfo == null)
{ {
return false; return false;
} }
if (torrentInfo.InfoHash.IsNullOrWhiteSpace()) if (torrentInfo.InfoHash.IsNotNullOrWhiteSpace())
{ {
return blocklistedByTitle.Where(b => b.Protocol == DownloadProtocol.Torrent) var blocklistedByTorrentInfohash = _blocklistRepository.BlocklistedByTorrentInfoHash(seriesId, torrentInfo.InfoHash);
.Any(b => SameTorrent(b, torrentInfo));
return blocklistedByTorrentInfohash.Any(b => SameTorrent(b, torrentInfo));
} }
var blocklistedByTorrentInfohash = _blocklistRepository.BlocklistedByTorrentInfoHash(seriesId, torrentInfo.InfoHash); return _blocklistRepository.BlocklistedByTitle(seriesId, release.Title)
.Where(b => b.Protocol == DownloadProtocol.Torrent)
return blocklistedByTorrentInfohash.Any(b => SameTorrent(b, torrentInfo)); .Any(b => SameTorrent(b, torrentInfo));
} }
return blocklistedByTitle.Where(b => b.Protocol == DownloadProtocol.Usenet) return _blocklistRepository.BlocklistedByTitle(seriesId, release.Title)
.Any(b => SameNzb(b, release)); .Where(b => b.Protocol == DownloadProtocol.Usenet)
.Any(b => SameNzb(b, release));
} }
public bool BlocklistedTorrentHash(int seriesId, string hash) public bool BlocklistedTorrentHash(int seriesId, string hash)