Don't choke if the active app isn't installed #6

Author: deanishe

.gitignore

@@ -1,3 +1,5 @@
+.alfredversionchecked
+
 # Created by https://www.gitignore.io/api/python
 
 ### Python ###

VPN-Manager-3.0.1.alfredworkflow VPN-Manager-3.0.2.alfredworkflow

@@ -401,7 +401,7 @@ or Tunnelblick app from https://tunnelblick.net/</string>
 		<string>Viscosity</string>
 	</dict>
 	<key>version</key>
-	<string>3.0.1</string>
+	<string>3.0.2</string>
 	<key>webaddress</key>
 	<string>https://github.com/deanishe/alfred-vpn-manager</string>
 </dict>

src/info.plist

@@ -0,0 +1,116 @@
+#!/usr/bin/osascript -l JavaScript
+
+ObjC.import('stdlib')
+
+Array.prototype.contains = function(val) {
+  for (var i; i < this.length; i++) {
+    if (this[i] === val)
+      return true
+  }
+  return false
+}
+
+app = Application('Shimo')
+help = `shimo.js <command> [<name>]
+
+Usage:
+    shimo.js (connect|disconnect) <name>
+    shimo.js list
+    shimo.js -h
+
+Options:
+    -h, --help    Show this message and quit
+`
+
+// Return true if specified VPN is connected.
+function isActive(name) {
+  for (var i=0; i < app.connections.length; i++) {
+    var conn = app.connections[i]
+    if (conn.name() == name) {
+      return conn.state() == 'Connected'
+    }
+  }
+  return false
+}
+
+
+// Show CLI help.
+function showHelp(errMsg) {
+  var status = 0
+  if (errMsg) {
+    console.log(`error: ${errMsg}`)
+    status = 1
+  }
+  console.log(help)
+  $.exit(status)
+}
+
+
+// Parse command-line flags.
+function parseArgs(argv) {
+  if (argv.length == 0 || argv.contains('-h') || argv.contains('--help')) {
+    showHelp()
+  }
+
+  var command = argv[0],
+      opts = {command: command, name: ''}
+
+  if (command === 'list') {
+    return opts
+  }
+
+  if (command === 'connect' || command === 'disconnect') {
+    if (argv.length < 2) {
+      showHelp('no VPN name specified')
+    }
+    opts.name = argv[1]
+    return opts
+  }
+
+  showHelp(`unknown command: ${command}`)
+}
+
+
+// Connect to specified VPN.
+function connect(name) {
+  if (isActive(name)) {
+    console.log(`VPN ${name} is already connected`)
+    return
+  }
+  app.connect(name)
+}
+
+
+// Disconnect specified VPN.
+function disconnect(name) {
+  if (!isActive(name)) {
+    console.log(`VPN ${name} is not connected`)
+    return
+  }
+  app.disconnect(name)
+}
+
+// Return JSON mapping of connections to connected state.
+function list() {
+  var accounts = {}
+
+  for (var i=0; i < app.accounts().length; i++) {
+    var acc = app.accounts[i]
+    accounts[acc.name()] = acc.connected()
+  }
+
+  return JSON.stringify(connections)
+}
+
+
+function run(argv) {
+  opts = parseArgs(argv)
+  switch (opts.command) {
+    case 'connect':
+      return connect(opts.name)
+    case 'disconnect':
+      return disconnect(opts.name)
+    case 'list':
+      return list()
+  }
+}

src/shimo.js

@@ -117,7 +117,7 @@ def info(self):
         """Return application info or `None` if not installed."""
         if self._info is False:
             self._info = appinfo(self.name)
-            log.debug('appinfo=%r', self._info)
+            log.debug('[%s] appinfo=%r', self.name, self._info)
         return self._info
 
     @property
@@ -336,7 +336,7 @@ def do_config(query):
     # ------------------------------------------------------
     # VPN apps
     for app in get_all_apps():
-        if app.selected:
+        if app.selected and app.installed:
             items.append(dict(
                 title=u'{} (active)'.format(app.name),
                 subtitle=u'{} is the active application'.format(app.name),

src/update-available.png

@@ -96,6 +96,7 @@ def utf8ify(s):
 
     Returns:
         str: UTF-8 string or string representation of s.
+
     """
     if isinstance(s, str):
         return s
@@ -124,6 +125,7 @@ def applescriptify(s):
 
     Returns:
         unicode: Escaped string
+
     """
     return s.replace(u'"', u'" & quote & "')
 
@@ -142,6 +144,7 @@ def run_command(cmd, **kwargs):
 
     Returns:
         str: Output returned by ``check_output``.
+
     """
     cmd = [utf8ify(s) for s in cmd]
     return subprocess.check_output(cmd, **kwargs)
@@ -190,6 +193,7 @@ def run_jxa(script, *args):
 
     Returns:
         str: Output of script.
+
     """
     return run_applescript(script, *args, lang='JavaScript')
 
@@ -206,6 +210,7 @@ def run_trigger(name, bundleid=None, arg=None):
         name (str): Name of External Trigger to call.
         bundleid (str, optional): Bundle ID of workflow trigger belongs to.
         arg (str, optional): Argument to pass to trigger.
+
     """
     if not bundleid:
         bundleid = os.getenv('alfred_workflow_bundleid')
@@ -231,6 +236,7 @@ def appinfo(name):
 
     Returns:
         AppInfo: :class:`AppInfo` tuple or ``None`` if app isn't found.
+
     """
     cmd = ['mdfind', '-onlyin', '/',
            '(kMDItemContentTypeTree == com.apple.application &&'