shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

CardigannIndexer: Fix andmatch filter to respect keywordsfilters resolves #7988 (#8007)

Browse Source
This commit is contained in:
krt-
2020-04-11 15:02:00 -04:00
committed by GitHub
parent c528fc0f98
commit f355db6788
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Jackett.Common/Indexers/CardigannIndexer.cs
View File

@@ -1603,7 +1603,9 @@ namespace Jackett.Common.Indexers
if (query.ImdbID != null && TorznabCaps.SupportsImdbMovieSearch) if (query.ImdbID != null && TorznabCaps.SupportsImdbMovieSearch)
break; // skip andmatch filter for imdb searches break; // skip andmatch filter for imdb searches
if (!query.MatchQueryStringAND(release.Title, CharacterLimit)) var queryKeywords = variables[".Keywords"] as string;
if (!query.MatchQueryStringAND(release.Title, CharacterLimit, queryKeywords))
{ {
logger.Debug(string.Format("CardigannIndexer ({0}): skipping {1} (andmatch filter)", ID, release.Title)); logger.Debug(string.Format("CardigannIndexer ({0}): skipping {1} (andmatch filter)", ID, release.Title));
SkipRelease = true; SkipRelease = true;

5
src/Jackett.Common/Models/TorznabQuery.cs
View File

@@ -148,9 +148,8 @@ namespace Jackett.Common.Models
// We cache the regex split results so we have to do it only once for each query. // We cache the regex split results so we have to do it only once for each query.
if (QueryStringParts == null) if (QueryStringParts == null)
{ {
var queryString = GetQueryString(); var queryString = !string.IsNullOrWhiteSpace(queryStringOverride) ? queryStringOverride : GetQueryString();
if (queryStringOverride != null)
queryString = queryStringOverride;
if (limit != null && limit > 0) if (limit != null && limit > 0)
{ {
if (limit > queryString.Length) if (limit > queryString.Length)