Report version number of native module for debugging.

raghur · Oct 7, 2018 · af27fa6 · af27fa6
1 parent aa1727a
commit af27fa6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/rplugin/python3/denite/filter/matcher/fruzzymatcher.py b/rplugin/python3/denite/filter/matcher/fruzzymatcher.py
@@ -28,10 +28,17 @@ def __init__(self, vim):
                 import fruzzy_mod
                 self.nativeMethod = fruzzy_mod.scoreMatchesStr
                 self.useNative = True
+                if 'version' not in dir(fruzzy_mod):
+                    self.debug("You have an old version of the native module")
+                    self.debug("please execute :call fruzzy#install()")
+                else:
+                    self.debug("fruzzy_mod ver: %s" %
+                               fruzzy_mod.version())
             except ImportError:
-                self.debug("Native module requested but unable to load native module")
+                self.debug("Native module requested but module was not found")
                 self.debug("falling back to python implementation")
-                self.debug("Check if you have nim_fuzzy.so or nim_fuzzy.pyd at %s" %
+                self.debug("execute :call fruzzy#install() to install the native module")
+                self.debug("and then check if you have fruzzy_mod.so or fruzzy_mod.pyd at %s" %
                            pkgPath)
                 self.useNative = False
         self.debug("usenative: %s" % self.useNative)

diff --git a/rplugin/python3/fruzzy_mod.nim b/rplugin/python3/fruzzy_mod.nim
@@ -6,12 +6,20 @@ import strformat
 import sequtils
 import tables
 import os
+import system
+
+proc getVersion(): string {.compileTime.}=
+    let ver = staticExec("git describe --tags --always --dirty")
+    # let cTime = format(times.now(), "yyyy-MM-dd hh:mm:ss")
+    let branch = staticExec("git rev-parse --abbrev-ref HEAD")
+    return &"rev: {ver} on branch: {branch}"
 
 let L = newConsoleLogger(levelThreshold = logging.Level.lvlDebug)
 addHandler(L)
 const MAXCHARCOUNT = 30
 
 const sep:string = "-/\\_. "
+const VERSION = getVersion()
 
 template info(args: varargs[string, `$`]) =
     when not defined(removelogger):
@@ -315,3 +323,6 @@ proc baseline(candidates: openarray[string] ): seq[tuple[i:int, r:int]] {.export
         idx.inc
     result.setlen(idx)
     return
+
+proc version():string {.exportpy.} =
+    return VERSION