Adding config option for macos strategy

Author: iloveitaly

aw_watcher_window/config.py

@@ -1,18 +1,30 @@
 from configparser import ConfigParser
+import argparse
 
 from aw_core.config import load_config as _load_config
 
-
 def load_config():
     default_client_config = ConfigParser()
-    default_client_config["aw-watcher-window"] = {
-        "exclude_title": False,
-        "poll_time": "1.0"
-    }
-    default_client_config["aw-watcher-window-testing"] = {
+    default_client_config["aw-watcher-window"] = default_client_config["aw-watcher-window-testing"] = {
         "exclude_title": False,
-        "poll_time": "1.0"
+        "poll_time": "1.0",
+        "macos_strategy": "jxa"
     }
 
     # TODO: Handle so aw-watcher-window testing gets loaded instead of testing is on
     return _load_config("aw-watcher-window", default_client_config)["aw-watcher-window"]
+
+def parse_args():
+    config = load_config()
+
+    default_poll_time = config.getfloat("poll_time")
+    default_exclude_title = config.getboolean("exclude_title")
+    default_macos_strategy = config.get("macos_strategy")
+
+    parser = argparse.ArgumentParser("A cross platform window watcher for Activitywatch.\nSupported on: Linux (X11), macOS and Windows.")
+    parser.add_argument("--testing", dest="testing", action="store_true")
+    parser.add_argument("--exclude-title", dest="exclude_title", action="store_true", default=default_exclude_title)
+    parser.add_argument("--verbose", dest="verbose", action="store_true")
+    parser.add_argument("--poll-time", dest="poll_time", type=float, default=default_poll_time)
+    parser.add_argument("--macos-strategy", dest="macos_strategy", default=default_macos_strategy, choices=["jxa", "applescript"])
+    return parser.parse_args()

aw_watcher_window/main.py

@@ -1,4 +1,3 @@
-import argparse
 import logging
 import traceback
 import sys
@@ -11,24 +10,19 @@
 from aw_client import ActivityWatchClient
 
 from .lib import get_current_window
-from .config import load_config
+from .config import parse_args
 
 logger = logging.getLogger(__name__)
 
 # enable this line for easier debugging
 # logger.setLevel(logging.DEBUG)
 
 def main():
-    # Read settings from config
-    config = load_config()
-    args = parse_args(
-        default_poll_time=config.getfloat("poll_time"),
-        default_exclude_title=config.getboolean("exclude_title"),
-    )
-
     if sys.platform.startswith("linux") and ("DISPLAY" not in os.environ or not os.environ["DISPLAY"]):
         raise Exception("DISPLAY environment variable not set")
 
+    args = parse_args()
+
     setup_logging(name="aw-watcher-window", testing=args.testing, verbose=args.verbose,
                   log_stderr=True, log_file=True)
 
@@ -47,27 +41,17 @@ def main():
 
     sleep(1)  # wait for server to start
     with client:
-        heartbeat_loop(client, bucket_id, poll_time=args.poll_time, exclude_title=args.exclude_title)
-
-
-def parse_args(default_poll_time: float, default_exclude_title: bool):
-    """config contains defaults loaded from the config file"""
-    parser = argparse.ArgumentParser("A cross platform window watcher for Activitywatch.\nSupported on: Linux (X11), macOS and Windows.")
-    parser.add_argument("--testing", dest="testing", action="store_true")
-    parser.add_argument("--exclude-title", dest="exclude_title", action="store_true", default=default_exclude_title)
-    parser.add_argument("--verbose", dest="verbose", action="store_true")
-    parser.add_argument("--poll-time", dest="poll_time", type=float, default=default_poll_time)
-    return parser.parse_args()
-
+        heartbeat_loop(client, bucket_id,
+        poll_time=args.poll_time, exclude_title=args.exclude_title, macos_strategy=args.macos_strategy)
 
-def heartbeat_loop(client, bucket_id, poll_time, exclude_title=False):
+def heartbeat_loop(client, bucket_id, poll_time, macos_strategy, exclude_title=False):
     while True:
         if os.getppid() == 1:
             logger.info("window-watcher stopped because parent process died")
             break
 
         try:
-            current_window = get_current_window()
+            current_window = get_current_window(macos_strategy=macos_strategy)
             logger.debug(current_window)
         except Exception as e:
             logger.error("Exception thrown while trying to get active window: {}".format(e))