[fixed #13] recursion/overflow error potentially fixed

- eq comparison is now self._name instead of the Name attribute
- iteration check now uses len()
- CollectionViewer no longer iterates itself
- multiple skip inputs allowed
- 'found' object prevents duplicate items (but potentially new ones)

Author: WolfpackWilson

pyvba/browser.py

@@ -1,11 +1,13 @@
 from pyvba.viewer import Viewer, FunctionViewer, CollectionViewer
+from collections import OrderedDict
 
 # used to skip predetermined objects by exact name
-# fixme: remove extra parameters
-skip = ['Application', 'Parent', 'Units', 'Parameters']
+skip = ['Application', 'Parent']
+
+# store a dictionary of the discovered items
+found = OrderedDict()
 
 
-# TODO: fix infinite recursion issue
 class Browser(Viewer):
     def __init__(self, app, name: str, parent: Viewer = None):
         """Create a browser from an application string or win32com object.
@@ -38,18 +40,26 @@ def from_viewer(viewer, parent=None):
             else Browser(viewer.com, viewer.name, viewer.parent if parent is None else parent)
 
     @staticmethod
-    def skip(item: str):
-        """Adds a keyword to the skip list."""
+    def clr_found():
+        """Clears the stored dictionary of items browsed."""
+        global found
+        found = OrderedDict()
+
+    @staticmethod
+    def skip(*item: str):
+        """Add one or more keywords to the skip list."""
         global skip
-        if item not in skip:
-            skip.append(item)
+        for i in item:
+            if i not in skip:
+                skip.append(i)
 
     @staticmethod
-    def rm_skip(item: str):
-        """Remove a keyword from the skip list."""
+    def rm_skip(*item: str):
+        """Remove one or more keywords from the skip list."""
         global skip
-        if item in skip:
-            skip.remove(item)
+        for i in item:
+            if i not in skip:
+                skip.remove(i)
 
     @staticmethod
     def clr_skip():
@@ -66,8 +76,9 @@ def all(self) -> dict:
 
     def _generate(self):
         """Iterates through all objects when called upon."""
-        global skip
+        global skip, found
 
+        # iterate through items
         for name in self._objects + [i.name for i in self._methods]:
             if name in skip:
                 continue
@@ -83,6 +94,17 @@ def _generate(self):
                 self._errors[name] = e.args
                 continue
 
+        # add items to the 'found' dictionary
+        for name, value in self._all.items():
+            if isinstance(value, Viewer):
+                if value.type not in found:
+                    found[value.type] = []
+
+                if value not in found[value.type]:
+                    found[value.type].append(value)
+                else:
+                    self._all[name] = found[value.type].index(value)
+
     def search(self, name: str, exact: bool = False):
         """Return a dictionary in format {path: item} matching the name.
 

pyvba/viewer.py

@@ -42,7 +42,7 @@ def __init__(self, app, name: str = None, parent: object = None):
         self._errors = {}
 
     def __eq__(self, other):
-        return other.type == self._type and other.getattr('Name') == self.getattr('Name')
+        return other.type == self._type and other.name == self._name
 
     def __getattr__(self, item):
         return self.getattr(item)
@@ -58,7 +58,7 @@ def ensure_dispatch(com):
         """
         try:
             app = EnsureDispatch(com)
-        except AttributeError:
+        except (AttributeError, TypeError):
             # Remove cache and try again.
             module_list = [m.__name__ for m in sys.modules.values()]
             for module in module_list:
@@ -75,7 +75,7 @@ def gettype(obj, item: str = None, parent: object = None):
             return FunctionViewer(obj, item)
         elif 'win32com' in repr(obj) or 'COMObject' in repr(obj):
             try:
-                _ = [e for e in obj]
+                _ = len(obj)
                 return CollectionViewer(obj, item, parent)
             except (TypeError, AttributeError):
                 return Viewer(obj, item, parent)
@@ -187,7 +187,7 @@ def __init__(self, obj, name: str = None, parent: object = None):
         super().__init__(obj, name, parent)
 
         self._count = len(self._com)
-        self._items = [Viewer.gettype(i, name, self) for i in self._com]
+        self._items = [Viewer.gettype(i, name, self) for i in self._com if i is not super()._com]
 
     def __str__(self):
         return super().__str__().replace('Viewer', 'CollectionViewer')