Standardize macos window lib with other OS window libs

aw_watcher_window/lib.py

@@ -18,7 +18,10 @@ def get_current_window_linux() -> Optional[dict]:
 
 def get_current_window_macos() -> Optional[dict]:
     from . import macos
-    return macos.getInfo()
+
+    app = macos.get_current_app()
+    print ("appname" + macos.get_app_name(app) + ", title" + macos.get_app_title(app))
+    return {"appname": macos.get_app_name(app), "title": macos.get_app_title(app)}
 
 
 def get_current_window_windows() -> Optional[dict]:

aw_watcher_window/macos.py

@@ -1,30 +1,27 @@
 from typing import Dict, Optional
-from AppKit import NSWorkspace
+from AppKit import NSWorkspace, NSRunningApplication
 from Quartz import (
     CGWindowListCopyWindowInfo,
     kCGWindowListOptionOnScreenOnly,
     kCGNullWindowID
 )
 
-def getInfo() -> Optional[Dict[str, str]]:
-    app = NSWorkspace.sharedWorkspace().frontmostApplication()
-    if app:
-        app_name = app.localizedName()
-        title = getTitle(app.processIdentifier())
+def get_current_app() -> Optional[NSRunningApplication]:
+    return NSWorkspace.sharedWorkspace().frontmostApplication()
 
-        print("appname: " + app_name + ", title: "+ title)
-        return {"appname": app_name, "title": title}
 
-    else:
-        return None
+def get_app_name(app: NSRunningApplication) -> str:
+    return app.localizedName()
 
-def getTitle(pid: int) -> str:
+
+def get_app_title(app: NSRunningApplication) -> str:
+    pid = app.processIdentifier()
     options = kCGWindowListOptionOnScreenOnly
     windowList = CGWindowListCopyWindowInfo(options, kCGNullWindowID)
 
     for window in windowList:
         lookupPid = window['kCGWindowOwnerPID']
-        if (pid == lookupPid):
-            return str(window.get('kCGWindowName', 'Non-detected window title'))
+        if (lookupPid == pid):
+            return window.get('kCGWindowName', 'Non-detected window title')
     return ""