Improve cycle detection

Keep a set of any bundle we've inspected before as a different set
compared to the current bundles being inspected as part of the depth
first chain.

This fixes a major performance problem with re-evaluating bundles that
have already been seen before while still allowing cycles to be
spotted and accurately reported in the bundle configurations.

Signed-off-by: William Douglas <[email protected]>

Author: bryteise

setup.py

@@ -2,6 +2,6 @@
 
 setup(
     name="unbundle",
-    version="0.1.6",
+    version="1.0.0",
     scripts=["unbundle"]
 )

unbundle

@@ -3,15 +3,18 @@ import argparse
 import os
 import sys
 
-def resolve_includes(bundle_name, bundle_path, content, bundles=False, path=set()):
+def resolve_includes(bundle_name, bundle_path, content, bundles=False, path=set(), seen=set()):
     """
     resolve_incudes returns a full package list of include-resolved packages in
     the bundle definition file or pundle declaration under bundle_path. Sources
     for included bundles are other bundle definition files at
     bundle_path/bundles/* and bundle_path/packages.
     """
-    bundle_def = os.path.join(bundle_path, "bundles", bundle_name)
+    if bundle_name in seen:
+        return True
+    seen.add(bundle_name)
     path.add(bundle_name)
+    bundle_def = os.path.join(bundle_path, "bundles", bundle_name)
     try:
         with open(bundle_def, "r", encoding="latin-1") as bundlef:
             lines = bundlef.readlines()
@@ -31,9 +34,8 @@ def resolve_includes(bundle_name, bundle_path, content, bundles=False, path=set(
         elif line.startswith("include("):
             inc_bundle = line[line.find("(")+1:line.find(")")]
             if inc_bundle in path:
-#                print(f"Error cycle detected: {inc_bundle} is part of a loop in bundles {path}.")
-#                return False
-                continue
+                print(f"Error cycle detected: {inc_bundle} is part of a loop in bundles {path}.")
+                return False
             success = resolve_includes(inc_bundle, bundle_path, content, bundles, path)
             if not success:
                 return False