From 34218461115313f220fce34ab645223a060f2977 Mon Sep 17 00:00:00 2001 From: Izalia Mae Date: Sun, 31 Mar 2024 11:00:31 -0400 Subject: [PATCH] add --watch option to lint dev command --- relay/dev.py | 109 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 43 deletions(-) diff --git a/relay/dev.py b/relay/dev.py index c03becd..7517946 100644 --- a/relay/dev.py +++ b/relay/dev.py @@ -4,9 +4,10 @@ import subprocess import sys import time -from datetime import datetime +from datetime import datetime, timedelta from pathlib import Path from tempfile import TemporaryDirectory +from typing import Sequence from . import __version__ from . import logger as logging @@ -47,14 +48,24 @@ def cli_install(): @cli.command('lint') @click.argument('path', required = False, default = 'relay') @click.option('--strict', '-s', is_flag = True, help = 'Enable strict mode for mypy') -def cli_lint(path: str, strict: bool) -> None: - cmd: list[str] = [sys.executable, '-m', 'mypy'] +@click.option('--watch', '-w', is_flag = True, + help = 'Automatically, re-run the linters on source change') +def cli_lint(path: str, strict: bool, watch: bool) -> None: + flake8 = [sys.executable, '-m', 'flake8', path] + mypy = [sys.executable, '-m', 'mypy', path] if strict: - cmd.append('--strict') + mypy.append('--strict') - subprocess.run([*cmd, path], check = False) - subprocess.run([sys.executable, '-m', 'flake8', path]) + if watch: + handle_run_watcher(mypy, flake8, wait = True) + return + + click.echo('----- flake8 -----') + subprocess.run(flake8) + + click.echo('\n\n----- mypy -----') + subprocess.run(mypy) @cli.command('build') @@ -91,8 +102,17 @@ def cli_build(): def cli_run(dev: bool): print('Starting process watcher') - handler = WatchHandler(dev) - handler.run_proc() + cmd = [sys.executable, '-m', 'relay', 'run'] + + if dev: + cmd.append('-d') + + handle_run_watcher(cmd) + + +def handle_run_watcher(*commands: Sequence[str], wait: bool = False): + handler = WatchHandler(*commands, wait = wait) + handler.run_procs() watcher = Observer() watcher.schedule(handler, str(SCRIPT), recursive=True) @@ -100,13 +120,12 @@ def cli_run(dev: bool): try: while True: - handler.proc.stdin.write(sys.stdin.read().encode('UTF-8')) # type: ignore - handler.proc.stdin.flush() # type: ignore + time.sleep(1) except KeyboardInterrupt: pass - handler.kill_proc() + handler.kill_procs() watcher.stop() watcher.join() @@ -114,61 +133,65 @@ def cli_run(dev: bool): class WatchHandler(PatternMatchingEventHandler): patterns = ['*.py'] - cmd = [sys.executable, '-m', 'relay', 'run'] - def __init__(self, dev: bool): + def __init__(self, *commands: Sequence[str], wait: bool = False): PatternMatchingEventHandler.__init__(self) - self.dev: bool = dev - self.proc: subprocess.Popen | None = None - self.last_restart: datetime | None = None + self.commands: Sequence[Sequence[str]] = commands + self.wait: bool = wait + self.procs: list[subprocess.Popen] = [] + self.last_restart: datetime = datetime.now() - def kill_proc(self): - if not self.proc or self.proc.poll() is not None: - return + def kill_procs(self): + for proc in self.procs: + if proc.poll() is not None: + continue - logging.info(f'Terminating process {self.proc.pid}') - self.proc.terminate() - sec = 0.0 + logging.info(f'Terminating process {proc.pid}') + proc.terminate() + sec = 0.0 - while self.proc.poll() is None: - time.sleep(0.1) - sec += 0.1 + while proc.poll() is None: + time.sleep(0.1) + sec += 0.1 - if sec >= 5: - logging.error('Failed to terminate. Killing process...') - self.proc.kill() - break + if sec >= 5: + logging.error('Failed to terminate. Killing process...') + proc.kill() + break - logging.info('Process terminated') + logging.info('Process terminated') - def run_proc(self, restart=False): - timestamp = datetime.timestamp(datetime.now()) - self.last_restart = timestamp if not self.last_restart else 0 - - if restart and self.proc.pid != '': - if timestamp - 3 < self.last_restart: + def run_procs(self, restart: bool = False): + if restart: + if datetime.now() - timedelta(seconds = 3) < self.last_restart: return - self.kill_proc() + self.kill_procs() - cmd = [*self.cmd, '-d'] if self.dev else self.cmd + self.last_restart = datetime.now() - self.proc = subprocess.Popen(cmd, stdin = subprocess.PIPE) - self.last_restart = timestamp + if self.wait: + self.procs = [] - logging.info('Started process with PID %i', self.proc.pid) - logging.info('Command: %s', ' '.join(cmd)) + for cmd in self.commands: + logging.info('Running command: %s', ' '.join(cmd)) + subprocess.run(cmd) + + else: + self.procs = list(subprocess.Popen(cmd) for cmd in self.commands) + pids = (str(proc.pid) for proc in self.procs) + logging.info('Started processes with PIDs: %s', ', '.join(pids)) def on_any_event(self, event): if event.event_type not in ['modified', 'created', 'deleted']: return - self.run_proc(restart = True) + self.run_procs(restart = True) if __name__ == '__main__':