replace watchdog with an invocation of watchman

Author: jhidding

entangled/commands/watch.py

@@ -1,39 +1,13 @@
 from pathlib import Path
 from threading import Event
-
-from watchdog.observers import Observer
-from watchdog.events import FileSystemEventHandler, FileSystemEvent
+import subprocess
 
 from ..status import find_watch_dirs
 
 from .sync import run_sync
 from .main import main
 
 
-class EventHandler(FileSystemEventHandler):
-    def __init__(self):
-        self.update_watched()
-
-    def update_watched(self):
-        self.watched = find_watch_dirs()
-
-    def on_any_event(self, event: FileSystemEvent):
-        if event.event_type == "opened":
-            return
-
-        if isinstance(event.src_path, bytes):
-            path = Path(event.src_path.decode("utf-8"))
-        else:
-            path = Path(event.src_path)
-
-        if path.absolute().is_relative_to(Path("./.entangled").absolute()):
-            return
-        if any(path.absolute().is_relative_to(p.absolute()) for p in self.watched):
-            run_sync()
-            # os.sync()
-        self.update_watched()
-
-
 def _watch(_stop_event: Event | None = None, _start_event: Event | None = None):
     """Keep a loop running, watching for changes. This interface is separated
     from the CLI one, so that it can be tested using threading instead of
@@ -42,22 +16,12 @@ def _watch(_stop_event: Event | None = None, _start_event: Event | None = None):
     def stop() -> bool:
         return _stop_event is not None and _stop_event.is_set()
 
-    run_sync()
-
-    event_handler = EventHandler()
-    observer = Observer()
-    observer.schedule(event_handler, ".", recursive=True)
-    observer.start()
-
     if _start_event:
         _start_event.set()
 
-    try:
-        while observer.is_alive() and not stop():
-            observer.join(0.1)
-    finally:
-        observer.stop()
-        observer.join()
+    while not stop():
+        subprocess.run(["watchman-wait"] + list(find_watch_dirs()))
+        run_sync()
 
 
 @main.command()

pyproject.toml

@@ -7,7 +7,6 @@ requires-python = ">=3.12,<4"
 readme = "README.md"
 license = "Apache-2.0"
 dependencies = [
-        "mawk>=0.1.7,<0.2",
         "filelock>=3.12.0,<4",
         "argh>=0.30,<0.31",
         "rich>=13.3.5,<14",
@@ -19,10 +18,10 @@ dependencies = [
         "pyyaml>=6.0.1,<7",
         "repl-session>=0.2.0",
         "msgspec>=0.20.0",
-        "watchdog>=6.0.0",
         "click>=8.3.0",
         "rich-click>=1.9.4",
         "typeguard>=4.4.4",
+        "pywatchman>=3.0.0",
 ]
 
 [project.urls]
@@ -72,4 +71,3 @@ testpaths = ["test"]
 
 [tool.mypy]
 packages = ["entangled"]
-