Fix appinfo to work on non-running apps

tests/test_util.py

@@ -222,17 +222,19 @@ def test_run_trigger():
 
 def test_appinfo():
     """App info for Safari."""
-    name = u'Safari'
-    bundleid = u'com.apple.Safari'
-    path = u'/Applications/Safari.app'
-
-    info = appinfo(name)
-    assert info is not None
-    assert info.name == name
-    assert info.path == path
-    assert info.bundleid == bundleid
-    for s in info:
-        assert isinstance(s, unicode)
+    for name, bundleid, path in [
+        (u'Safari', u'com.apple.Safari', u'/Applications/Safari.app'),
+        (u'Digital Color Meter', u'com.apple.DigitalColorMeter',
+         u'/Applications/Utilities/Digital Color Meter.app'),
+    ]:
+
+        info = appinfo(name)
+        assert info is not None
+        assert info.name == name
+        assert info.path == path
+        assert info.bundleid == bundleid
+        for s in info:
+            assert isinstance(s, unicode)
 
     # Non-existant app
     info = appinfo("Big, Hairy Man's Special Breakfast Pants")

workflow/util.py

@@ -232,27 +232,21 @@ def appinfo(name):
     Returns:
         AppInfo: :class:`AppInfo` tuple or ``None`` if app isn't found.
     """
-    cmd = ['/usr/bin/lsappinfo', 'info', name]
-    output = run_command(cmd).strip()
-    if not output:  # Application isn't installed
-        return None
-
-    path = bid = None
-    for line in output.split('\n'):
-        line = line.strip()
-        if '=' in line:
-            k, v = line.split('=', 1)
-            v = v.strip('"')
+    cmd = ['mdfind', '-onlyin', '/',
+           '(kMDItemContentTypeTree == com.apple.application &&'
+           '(kMDItemDisplayName == "{0}" || kMDItemFSName == "{0}.app"))'
+           .format(name)]
 
-            if k == 'bundleID':
-                bid = v
-            elif k == 'bundle path':
-                path = v.rstrip('/')
+    path = run_command(cmd).strip()
+    if not path:
+        return None
 
-    if bid and path:
-        return AppInfo(*[unicodify(s) for s in (name, path, bid)])
+    cmd = ['mdls', '-raw', '-name', 'kMDItemCFBundleIdentifier', path]
+    bid = run_command(cmd).strip()
+    if not bid:  # pragma: no cover
+        return None
 
-    return None  # pragma: no cover
+    return AppInfo(unicodify(name), unicodify(path), unicodify(bid))
 
 
 @contextmanager

workflow/version

@@ -1 +1 @@
-1.31
+1.32