Version bump v2.0.0-beta.18

+ Improved progress messages while scanning files

Author: Kronuz

codeintel/__init__.py

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

codeintel/codeintel2/citadel.py

@@ -192,8 +192,7 @@ def scan_error(self):
         finally:
             self.release_lock()
 
-    @property
-    def blob_from_lang(self):
+    def get_blob_from_lang(self, reporter=None):
         self.acquire_lock()
         try:
             if self._blob_from_lang_cache is None:
@@ -202,14 +201,18 @@ def blob_from_lang(self):
                 except NotFoundInDatabase:
                     self.release_lock()
                     try:
-                        self.scan()
+                        self.scan(reporter=reporter)
                     finally:
                         self.acquire_lock()
                     self._load_buf_data_once(True)
             return self._blob_from_lang_cache
         finally:
             self.release_lock()
 
+    @property
+    def blob_from_lang(self):
+        return self.get_blob_from_lang()
+
     @property
     def tree(self):
         """The CIX tree for this buffer. Will lazily scan if necessary."""
@@ -239,7 +242,7 @@ def cix(self):
         """The CIX for this buffer. Will lazily scan if necessary."""
         return ET.tostring(self.tree)
 
-    def scan(self, mtime=None, skip_scan_time_check=False):
+    def scan(self, mtime=None, skip_scan_time_check=False, reporter=None):
         """Scan the current buffer.
 
             "mtime" is the modification time of the buffer content. If
@@ -257,6 +260,9 @@ def scan(self, mtime=None, skip_scan_time_check=False):
         if mtime is None:
             mtime = time.time()
 
+        if reporter:
+            reporter("Scanning %s file '%s'" % (self.lang, self.path))
+
         #TODO: Eventually would like the CILEDriver scan methods to have
         #      a signature more inline with
         #      blob_from_lang/scan_time/scan_error. I.e. drop
@@ -350,9 +356,9 @@ def scoperef_from_blob_and_line(self, blob, line): # line is 1-based
                 break
         return (blob, lpath)
 
-    def scan_if_necessary(self):
+    def scan_if_necessary(self, reporter=None):
         # SIDE-EFFECT: results in `self.scan()` if not in the db.
-        self.blob_from_lang
+        self.get_blob_from_lang(reporter=reporter)
 
     def unload(self):
         """Remove this buffer from the database."""
@@ -367,7 +373,7 @@ def __init__(self, lang, mgr, env, path):
         self.lang = lang
         super(BinaryBuffer, self).__init__(mgr, None, env, path, None)
 
-    def scan(self, mtime=None, skip_scan_time_check=False):
+    def scan(self, mtime=None, skip_scan_time_check=False, reporter=None):
         if self.path is None:
             raise CodeIntelError("cannot scan %s buffer: 'path' is not set (setting "
                                  "a fake path starting with '<Unsaved>' is okay)"
@@ -377,6 +383,9 @@ def scan(self, mtime=None, skip_scan_time_check=False):
         if mtime is None:
             mtime = time.time()
 
+        if reporter:
+            reporter("Scanning %s file '%s'" % (self.lang, self.path))
+
         scan_tree = None
         try:
             scan_tree = cile_driver.scan_binary(self)

codeintel/codeintel2/database/langlibbase.py

@@ -92,14 +92,12 @@ def ensure_dir_scanned(self, dir, ctlr=None, reporter=None):
                     return
                 current += 1
                 if base not in res_index:
-                    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
+                    def scan_reporter(msg):
+                        if reporter and hasattr(reporter, "onScanFile"):
+                            try:
+                                reporter.onScanFile(msg, dir, current, total)
+                            except:
+                                pass  # eat any errors about reporting progress
                     try:
                         buf = self.mgr.buf_from_path(join(dir, base),
                                                      lang=self.lang)
@@ -110,7 +108,7 @@ def ensure_dir_scanned(self, dir, ctlr=None, reporter=None):
                         continue
                     if ctlr is not None:
                         ctlr.info("load %r", buf)
-                    buf.scan_if_necessary()
+                    buf.scan_if_necessary(reporter=reporter and scan_reporter)
 
             # Remove scanned paths that don't exist anymore.
             for base in removed_values:

codeintel/codeintel2/udl.py

@@ -492,12 +492,12 @@ def __init__(self, *args, **kwargs):
         self.env.add_pref_observer("default%sDecl" % self.m_lang,
                                    self.__on_pref_change)
 
-    def scan(self, mtime=None, skip_scan_time_check=False):
+    def scan(self, mtime=None, skip_scan_time_check=False, reporter=None):
         """Rescan the buffer.
         In the XML parsing buffer's case, we should do whatever the normal
         thing is, plus force a reparse of the XML.
         """
-        super(XMLParsingBufferMixin, self).scan(mtime, skip_scan_time_check)
+        super(XMLParsingBufferMixin, self).scan(mtime, skip_scan_time_check, reporter=reporter)
         # Reset xml tree cache, so sections list works correctly - bug 101442.
         self._xml_tree_cache = None