fix category selection

graphsense · Feb 28, 2023 · dc453a7 · dc453a7
1 parent 63a868e
commit dc453a7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,7 @@ build
 .DS_Store
 data
 docker-compose.override.yml
-tagpack-repos.config
+tagpack-repos*.config
 
 # Temporary and binary files
 *~

diff --git a/src/tagpack/cli.py b/src/tagpack/cli.py
@@ -374,9 +374,10 @@ def get_label(actor_row):
 
                 return [(x["id"], get_label(x)) for x in res]
 
+            category_filter = strip_empty(args.only_categories.split(","))
             updated = tagpack.add_actors(
                 find_actor_candidates,
-                only_categories=strip_empty(args.only_categories.split(",")),
+                only_categories=category_filter if len(category_filter) > 0 else None,
                 user_choice_cache=user_choice_cache,
             )
 

diff --git a/src/tagpack/tagpack.py b/src/tagpack/tagpack.py
@@ -418,8 +418,8 @@ def get_user_choice_cached(hl, cache):
             "label" in self.all_header_fields
             and "actor" not in self.all_header_fields
             and (
-                only_categories is not None
-                and self.all_header_fields.get("category") in only_categories
+                only_categories is None
+                or self.all_header_fields.get("category", "") in only_categories
             )
         ):
             hl = self.all_header_fields.get("label")