Changeset 377

Timestamp:

01/19/06 23:49:38 (3 years ago)

Author:

athomas

Message:

PyDocPlugin:

• Updated search to respect include/exclude filters.
  

Files:

• pydocplugin/0.9/tracpydoc/tracpydoc.py (modified) (3 diffs)

pydocplugin/0.9/tracpydoc/tracpydoc.py

@@ -63 +63 @@
-                shadowed[name] = 1
-
-
-
-
-
-
-
-
-
-
+
-
-        # Package spam/__init__.py takes precedence over module spam.py.
-
-        # Do matching against include/exclude list
-        for file in files:
-            path = os.path.join(dir, file)
@@ -155 +145 @@
-            self.syspath = sys.path
-
-
-
-
-
+
-
-        show_private = self.config.get('pydoc', 'show_private', '')
-        self.show_private = [p.rstrip('.*') for p in show_private.split()]
-        self.makedoc_lock = threading.Lock()
+
+    def filter_match(self, file):
+        includes, excludes = self.get_filters()
+        for match in excludes:
+            if fnmatch(file, match):
+                return 0
+        for match in includes:
+            if fnmatch(file, match):
+                return 1
+        return not includes
+
+
+    def get_filters(self):
+        return ([p for p in self.config.get('pydoc',
+                         'include', '').split() if p],
+                [p for p in self.config.get('pydoc',
+                         'exclude', '').split() if p])
-
-    def load_object(self, fullobject):
@@ -366 +370 @@
-
-    def get_search_filters(self, req):
-
+, 0
-
-    def get_search_results(self, req, query, filters):
-        query = query.split()
-        results = []
+        matched = PyDoc(self.env).filter_match
-        if 'pydoc' in filters:
-            def callback(path, modname, desc):
-                for q in query:
+                    if (path and not matched(path)) and (modname and not matched(modname)):
+                        return
-                    if q in modname or q.lower() in desc.lower():
-                        results.append((self.env.href.pydoc(modname), modname,