cardigann: respect the categories from search paths (#14395)

Jackett · May 28, 2023 · 7e7ace0 · 7e7ace0
1 parent 12da8b6
commit 7e7ace0
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs
@@ -1349,8 +1349,6 @@ protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuer
                 mappedCategories = DefaultCategories;
             }
 
-            variables[".Categories"] = mappedCategories;
-
             var KeywordTokens = new List<string>();
             var KeywordTokenKeys = new List<string> { "Q", "Series", "Movie", "Year" };
             foreach (var key in KeywordTokenKeys)
@@ -1369,15 +1367,26 @@ protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuer
             var SearchPaths = Search.Paths;
             foreach (var SearchPath in SearchPaths)
             {
+                variables[".Categories"] = mappedCategories;
+
                 // skip path if categories don't match
                 if (SearchPath.Categories.Count > 0)
                 {
-                    var invertMatch = (SearchPath.Categories[0] == "!");
                     var hasIntersect = mappedCategories.Intersect(SearchPath.Categories).Any();
-                    if (invertMatch)
+
+                    if (SearchPath.Categories[0] == "!")
+                    {
                         hasIntersect = !hasIntersect;
+                    }
+
                     if (!hasIntersect)
+                    {
+                        variables[".Categories"] = mappedCategories.Except(SearchPath.Categories).ToList();
+
                         continue;
+                    }
+
+                    variables[".Categories"] = mappedCategories.Intersect(SearchPath.Categories).ToList();
                 }
 
                 // build search URL