Use new jxa implementation in macos python branch

Author: iloveitaly

aw_watcher_window/lib.py

@@ -17,12 +17,9 @@ def get_current_window_linux() -> Optional[dict]:
 
 
 def get_current_window_macos() -> Optional[dict]:
+    # TODO should we use unknown when the title is blank like the other platforms?
     from . import macos
-    info = macos.getInfo()
-    app = macos.getApp(info)
-    title = macos.getTitle(info)
-
-    return {"title": title, "appname": app}
+    return macos.getInfo()
 
 
 def get_current_window_windows() -> Optional[dict]:

aw_watcher_window/macos.py

@@ -1,21 +1,20 @@
 import subprocess
-from subprocess import PIPE
 import os
+import json
+import logging
 
+logger = logging.getLogger(__name__)
 
 def getInfo() -> str:
-    cmd = ["osascript", os.path.join(os.path.dirname(os.path.realpath(__file__)), "printAppTitle.scpt")]
-    p = subprocess.run(cmd, stdout=PIPE)
-    return str(p.stdout, "utf8").strip()
-
-
-def getApp(info: str) -> str:
-    return info.split('","')[0][1:]
-
-
-def getTitle(info: str) -> str:
-    return info.split('","')[1][:-1]
-
+    cmd = [os.path.join(os.path.dirname(os.path.realpath(__file__)), "printAppStatus.jxa")]
+    p = subprocess.run(cmd, stdout=subprocess.PIPE)
+    result = str(p.stdout, "utf8").strip()
+
+    try:
+        return json.loads(result)
+    except JSONDecodeError as e:
+        logger.warn("invalid JSON encountered {result}")
+        return {}
 
 def background_ensure_permissions() -> None:
     from multiprocessing import Process