Skip to content

feat: add port option #11

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.

Sign up for GitHub

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

Merged
ErikBjare merged 4 commits into from
Feb 24, 2025
Merged

feat: add port option #11

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
422c3a7
feat: add port option
BelKed Feb 24, 2025
dbb5668
fix: use port 5666 when testing
BelKed Feb 24, 2025
daa59fe
refactor: simplify port handling in main and start functions
BelKed Feb 24, 2025
d8e96c5
feat: add common options for testing and port configuration in CLI
BelKed Feb 24, 2025
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
35 changes: 29 additions & 6 deletions aw_notify/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,11 +321,33 @@ def init_macos():
NSBundle.mainBundle.bundleIdentifier = "net.activitywatch.ActivityWatch"


def common_options(func):
"""Common click options used across commands."""
options = [
click.option("--testing", is_flag=True, help="Enables testing mode."),
click.option(
"--port",
type=int,
default=None,
help="Port to connect to ActivityWatch server (default: 5600, or 5666 for testing).",
),
]
for option in reversed(options):
func = option(func)
return func


@click.group(invoke_without_command=True)
@click.pass_context
@click.option("-v", "--verbose", is_flag=True, help="Verbose logging.")
@click.option("--testing", is_flag=True, help="Enables testing mode.")
def main(ctx, verbose: bool, testing: bool):
@common_options
def main(ctx, verbose: bool, testing: bool, port: Optional[int]):
Copy link

@ellipsis-dev ellipsis-dev bot Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider updating the main() docstring/comment to mention the new 'port' option. Also, sharing common options (like testing and port) via a decorator could reduce duplication.

Copy link
Member

@ErikBjare ErikBjare Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I agree with this, but I'll accept it.

"""
ActivityWatch notification service.

Sends notifications based on computer usage data from ActivityWatch.
Can connect to a custom ActivityWatch server port (default: 5600, or 5666 for testing).
"""
setup_logging("aw-notify", testing=testing, verbose=verbose, log_file=True)
logging.getLogger("urllib3").setLevel(logging.WARNING)
logger.info("Starting...")
Expand All @@ -334,15 +356,16 @@ def main(ctx, verbose: bool, testing: bool):
init_macos()

if ctx.invoked_subcommand is None:
ctx.invoke(start, testing=testing)
ctx.invoke(start, testing=testing, port=port)


@main.command()
@click.option("--testing", is_flag=True, help="Enables testing mode.")
def start(testing=False):
@common_options
def start(testing=False, port=None):
"""Start the notification service."""
global aw, hostname
aw = aw_client.ActivityWatchClient("aw-notify", testing=testing)

aw = aw_client.ActivityWatchClient("aw-notify", testing=testing, port=port)
aw.wait_for_start()
hostname = aw.get_info().get("hostname", "unknown")

Expand Down