do some more cleanup of trees

Author: jasinner

src/trustshell/product_definitions.py

@@ -213,7 +213,7 @@ def _clean_cpe(cpe: str) -> str:
     def extend_with_product_mappings(
         self, ancestor_trees: list[Node], keep_cpes: bool = False
     ) -> None:
-        """Create a new list of results with any matching streams or module as ancestors
+        """Update the ancestor_trees with any matching streams or module as descendants
 
         Args:
             ancestor_trees: List of Node trees to extend with product mappings

src/trustshell/products.py

@@ -72,6 +72,7 @@ def prime_cache(check: bool, debug: bool) -> None:
     is_eager=True,
 )
 @click.option("--latest", "-l", is_flag=True, default=True)
+@click.option("--cpes", "-c", is_flag=True, default=False)
 @click.option("--flaw", "-f", help="OSIDB flaw uuid or CVE")
 @click.option(
     "--replace",
@@ -85,7 +86,9 @@ def prime_cache(check: bool, debug: bool) -> None:
     "purl",
     type=click.STRING,
 )
-def search(purl: str, flaw: str, replace: bool, debug: bool, latest: bool) -> None:
+def search(
+    purl: str, flaw: str, replace: bool, debug: bool, latest: bool, cpes: bool
+) -> None:
     """Relate a purl to products in Trustify"""
     if not debug:
         config_logging(level="INFO")
@@ -104,9 +107,15 @@ def search(purl: str, flaw: str, replace: bool, debug: bool, latest: bool) -> No
         return
 
     prod_defs = ProdDefs()
-    prod_defs.extend_with_product_mappings(ancestor_trees)
+    prod_defs.extend_with_product_mappings(ancestor_trees, keep_cpes=cpes)
 
+    seen_trees = set()
     for tree in ancestor_trees:
+        _remove_duplicate_branches(tree)
+        tree_signature = _get_branch_signature(tree.root)
+        if tree_signature in seen_trees:
+            continue
+        seen_trees.add(tree_signature)
         render_tree(tree.root)
 
     if not flaw:
@@ -353,14 +362,15 @@ def _trees_with_cpes(ancestor_data: dict[str, Any]) -> list[Node]:
         if tree.name.startswith("pkg:rpm/"):
             if container_in_tree(tree):
                 continue
+        _remove_non_cpe_branches(tree)
         if not _has_cpe_node(tree):
             for leaf in tree.leaves:
                 logger.debug(
                     f"Found result {tree.name} with ancestor: {leaf.name} but no CPE parent"
                 )
         else:
             trees_with_cpes.append(tree)
-    return [_remove_non_cpe_branches(tree) for tree in trees_with_cpes]
+    return trees_with_cpes
 
 
 def container_in_tree(root: Node) -> bool: