Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature] Add exclude_titles feature for enhanced window title exclusion #99

Merged
merged 7 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions aw_watcher_window/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
default_config = """
[aw-watcher-window]
exclude_title = false
exclude_titles = []
poll_time = 1.0
strategy_macos = "swift"
""".strip()
Expand All @@ -19,6 +20,7 @@ def parse_args():

default_poll_time = config["poll_time"]
default_exclude_title = config["exclude_title"]
default_exclude_titles = config["exclude_titles"]
default_strategy_macos = config["strategy_macos"]

parser = argparse.ArgumentParser(
Expand All @@ -33,6 +35,13 @@ def parse_args():
action="store_true",
default=default_exclude_title,
)
parser.add_argument(
"--exclude-titles",
dest="exclude_titles",
nargs='+',
default=default_exclude_titles,
help="Exclude window titles by regular expression. Can specify multiple times."
)
parser.add_argument("--verbose", dest="verbose", action="store_true")
parser.add_argument(
"--poll-time", dest="poll_time", type=float, default=default_poll_time
Expand Down
15 changes: 14 additions & 1 deletion aw_watcher_window/main.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import logging
import os
import re
import signal
import subprocess
import sys
Expand Down Expand Up @@ -30,6 +31,13 @@
except ProcessLookupError:
logger.info("Process {} already dead".format(pid))

def try_compile_title_regex(title):

Check notice

Code scanning / CodeQL

Explicit returns mixed with implicit (fall through) returns Note

Mixing implicit and explicit returns may indicate an error as implicit returns always return None.
try:
return re.compile(title, re.IGNORECASE)
except re.error:
logger.error(f"Invalid regex pattern: {title}")
exit(1)


def main():
args = parse_args()
Expand Down Expand Up @@ -92,10 +100,11 @@
poll_time=args.poll_time,
strategy=args.strategy,
exclude_title=args.exclude_title,
exclude_titles=[try_compile_title_regex(title) for title in args.exclude_titles if title is not None]
)


def heartbeat_loop(client, bucket_id, poll_time, strategy, exclude_title=False):
def heartbeat_loop(client, bucket_id, poll_time, strategy, exclude_title=False, exclude_titles=[]):
while True:
if os.getppid() == 1:
logger.info("window-watcher stopped because parent process died")
Expand Down Expand Up @@ -128,6 +137,10 @@
if current_window is None:
logger.debug("Unable to fetch window, trying again on next poll")
else:
for pattern in exclude_titles:
if pattern.search(current_window["title"]):
current_window["title"] = "excluded"

if exclude_title:
current_window["title"] = "excluded"

Expand Down
Loading