Version bump v2.0.0-beta.17

+ Show progress while scanning files

Author: Kronuz

codeintel/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.0-beta.16'
+__version__ = '2.0.0-beta.17'

codeintel/codeintel2/database/langlibbase.py

@@ -61,7 +61,7 @@ def ensure_all_dirs_scanned(self, ctlr=None):
                                                  len(dirs))
                 except:
                     pass # eat any errors about reporting progress
-                self.ensure_dir_scanned(dir, ctlr=ctlr, reporter=lambda msg: None)
+                self.ensure_dir_scanned(dir, ctlr=ctlr)
                 scanned.add(dir)
         finally:
             # report that we have stopped scanning
@@ -79,20 +79,27 @@ def ensure_dir_scanned(self, dir, ctlr=None, reporter=None):
         if dir not in self._have_ensured_scanned_from_dir_cache:
             if reporter is None:
                 reporter = self.lang_zone.db.event_reporter
-            if not callable(reporter):
-                reporter = None
             res_index = self.lang_zone.load_index(dir, "res_index", {})
             importables = self._importables_from_dir(dir)
             importable_values = [i[0] for i in importables.values()
                                  if i[0] is not None]
+            removed_values = set(res_index.keys()).difference(importable_values)
+            current = 0
+            total = len(importable_values) + len(removed_values)
             for base in importable_values:
                 if ctlr and ctlr.is_aborted():
                     log.debug("ctlr aborted")
                     return
+                current += 1
                 if base not in res_index:
-                    if reporter:
-                        reporter("scanning %s files in '%s'" % (self.lang, dir))
-                        reporter = None # don't report again
+                    if reporter and hasattr(reporter, "onScanFile"):
+                        try:
+                            reporter.onScanFile("Scanning %s file '%s'" % (self.lang, join(dir, base)),
+                                                dir,
+                                                current,
+                                                total)
+                        except:
+                            pass  # eat any errors about reporting progress
                     try:
                         buf = self.mgr.buf_from_path(join(dir, base),
                                                      lang=self.lang)
@@ -106,14 +113,19 @@ def ensure_dir_scanned(self, dir, ctlr=None, reporter=None):
                     buf.scan_if_necessary()
 
             # Remove scanned paths that don't exist anymore.
-            removed_values = set(res_index.keys()).difference(importable_values)
             for base in removed_values:
                 if ctlr and ctlr.is_aborted():
                     log.debug("ctlr aborted")
                     return
-                if reporter:
-                    reporter("scanning %s files in '%s'" % (self.lang, dir))
-                    reporter = None # don't report again
+                current += 1
+                if reporter and hasattr(reporter, "onScanFile"):
+                    try:
+                        reporter.onScanFile("Scanning %s file '%s'" % (self.lang, join(dir, base)),
+                                            dir,
+                                            current,
+                                            total)
+                    except:
+                        pass  # eat any errors about reporting progress
                 basename = join(dir, base)
                 self.lang_zone.remove_path(basename)
 

codeintel/codeintel2/oop/driver.py

@@ -239,6 +239,23 @@ def onScanDirectory(self, description, dir_path, current=None, total=None):
                       completed=len(self._completed_dirs),
                       total=len(self._dirs))
 
+        def onScanFile(self, description, file_path, current=None, total=None):
+            """Called when a directory is being scanned (out of possibly many)
+            @param description {unicode} A string suitable for showing the user
+                    regarding the progress
+            @param dir {unicode} The directory currently being scanned
+            @param current {int} The current progress
+            @param total {int} The total number of directories to scan in this
+                    request
+            """
+            self.debug("scan file: %s (%s %s/%s)",
+                      description, file_path, current, total)
+
+            assert file_path, "onScanDirectory got no directory"
+            self.send(type="scan-progress", message=description,
+                      completed=current,
+                      total=total)
+
         def onScanComplete(self, dirs=set(), scanned=set()):
             """Called when a scan operation is complete
             @param dirs {set of unicode} The directories that were intially