Update version to 2.0.2 + misc client side fixes

- Use python instead of python3 in scripts for compatability with WSL
- Use grep in precommit because of non-recursive wildcard behavior
- Add more information to verbose log to debug on-going issues.

.githooks/pre-commit

@@ -14,14 +14,14 @@ then
     exit 1
 fi
 
-changed=$(git diff --cached --name-only --diff-filter=ACMR "*.java" "*.ts" "*.css")
+changed=$(git diff --cached --name-only --diff-filter=ACMR | grep -P "\.(java|ts|css)$")
 for f in ${changed[@]} ; do
     echo "Formatting $f..."
     prettier --write "$f" &>/dev/null
     git add "$f"
 done
 
-changed=$(git diff --cached --name-only --diff-filter=ACMR "*.py")
+changed=$(git diff --cached --name-only --diff-filter=ACMR | grep -P "\.py$")
 for f in ${changed[@]} ; do
     echo "Formatting $f..."
     black -l 100 "$f" &>/dev/null

client/bin/build.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 import os.path
 import subprocess

client/bin/dev.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 import os
 import subprocess
@@ -7,7 +7,7 @@
 os.chdir(os.path.join(os.path.dirname(os.path.realpath(__file__)), ".."))
 
 if len(sys.argv) == 1:
-    subprocess.check_call("python3 ./bin/build.py", shell=True)
+    subprocess.check_call("python ./bin/build.py", shell=True)
 
 env = {**os.environ, **{"npm_config_arch": "x64"}}
 subprocess.check_call("npm run dev", env=env, shell=True)

client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "Serenade",
   "productName": "Serenade",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "author": "Serenade Labs, Inc. <contact@serenade.ai>",
   "description": "Code with voice. Learn more at https://serenade.ai",
   "license": "MIT",

client/src/main/ipc/local.ts

@@ -127,8 +127,13 @@ export default class Local {
     this.started = true;
     this.killAll();
     this.pollUntilRunning();
+
     let speechEngineModels = path.join(__dirname, "..", "static", "local", "speech-engine-models");
+    this.log.logVerbose("Initial speech engine model path: " + speechEngineModels);
+
     let codeEngineModels = path.join(__dirname, "..", "static", "local", "code-engine-models");
+    this.log.logVerbose("Initial code engine model path: " + codeEngineModels);
+
     if (os.platform() == "win32") {
       speechEngineModels =
         "/" +
@@ -140,6 +145,8 @@ export default class Local {
           ])
           .stdout.toString()
           .trim();
+      this.log.logVerbose("WSL speech engine path: " + speechEngineModels);
+
       codeEngineModels =
         "/" +
         child_process
@@ -150,6 +157,7 @@ export default class Local {
           ])
           .stdout.toString()
           .trim();
+      this.log.logVerbose("WSL code engine path: " + codeEngineModels);
     }
 
     // here and below: WSL doesn't deal well with paths, so set the cwd to be the same as the binary

client/src/main/ipc/server.ts

@@ -33,13 +33,14 @@ export default class IPCServer {
         if (request.message == "active") {
           let icon = request.data.icon;
 
-          const iconValid = (
+          const iconValid =
             icon == undefined ||
-            (typeof icon == 'string' && icon.startsWith('data:') && icon.length <= maximumIconLength)
-          );
+            (typeof icon == "string" &&
+              icon.startsWith("data:") &&
+              icon.length <= maximumIconLength);
 
           if (!iconValid) {
-            this.log.logVerbose('Plugin provided an app icon that does not adhere to requirements');
+            this.log.logVerbose("Plugin provided an app icon that does not adhere to requirements");
             icon = undefined;
           }
 
@@ -48,7 +49,7 @@ export default class IPCServer {
             request.data.id,
             request.data.app,
             request.data.match,
-            icon,
+            icon
           );
         } else if (request.message == "callback") {
           this.pluginManager.resolve(request.data.callback, request.data.data);
@@ -59,6 +60,15 @@ export default class IPCServer {
         }
         // custom commands messages from custom commands servers
         if (request.message == "customCommands") {
+          this.log.logVerbose(
+            "Received " +
+              request.data.commands.length +
+              " commands, " +
+              request.data.hints.length +
+              " hints, " +
+              request.data.words.length +
+              " words"
+          );
           this.active.customCommands = request.data.commands;
           this.active.customHints = request.data.hints;
           this.active.customWords = request.data.words;