Build on PR

aw_watcher_window/macos.py

@@ -1,28 +1,30 @@
-from typing import Optional
+from typing import Dict, Optional
 from AppKit import NSWorkspace
 from Quartz import (
     CGWindowListCopyWindowInfo,
     kCGWindowListOptionOnScreenOnly,
     kCGNullWindowID
 )
 
-def getInfo() -> Optional[dict]:
-    app_name = ''
-    title = ''
+def getInfo() -> Optional[Dict[str, str]]:
+    app = NSWorkspace.sharedWorkspace().frontmostApplication()
+    if app:
+        app_name = app.localizedName()
+        title = getTitle(app.processIdentifier())
 
-    app = NSWorkspace.sharedWorkspace().activeApplication()
+        print("appname: " + app_name + ", title: "+ title)
+        return {"appname": app_name, "title": title}
 
-    if app:
-        pid = app['NSApplicationProcessIdentifier']
+    else:
+        return None
+
+def getTitle(pid: int) -> str:
+    options = kCGWindowListOptionOnScreenOnly
+    windowList = CGWindowListCopyWindowInfo(options, kCGNullWindowID)
 
-        options = kCGWindowListOptionOnScreenOnly
-        window_list = CGWindowListCopyWindowInfo(options, kCGNullWindowID)
-        for window in window_list:
-            if pid == window['kCGWindowOwnerPID']:
-                # We could use app['NSApplicationName'], but this value is more
-                # accurate and matches other methods (like applescript)
-                app_name = window['kCGWindowOwnerName']
-                title = window.get('kCGWindowName', u'')
-                break
+    for window in windowList:
+        lookupPid = window['kCGWindowOwnerPID']
+        if (pid == lookupPid):
+            return str(window.get('kCGWindowName', 'Non-detected window title'))
+    return ""
 
-    return {"appname": app_name, "title": title}