merge watchman branch

Author: jhidding

entangled/commands/watch.py

@@ -1,37 +1,11 @@
-from pathlib import Path
 from threading import Event
 
-from watchdog.observers import Observer
-from watchdog.events import FileSystemEventHandler, FileSystemEvent
-
 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()
+import watchfiles
 
 
 def _watch(_stop_event: Event | None = None, _start_event: Event | None = None):
@@ -44,20 +18,13 @@ def stop() -> bool:
 
     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()
+    dirs = "."  # find_watch_dirs()
+    
+    for changes in watchfiles.watch(dirs, stop_event=_stop_event):
+        run_sync()
 
 
 @main.command()

pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
         "click>=8.3.0",
         "rich-click>=1.9.4",
         "typeguard>=4.4.4",
-        "watchdog>=7.0",
+        "watchfiles>=1.1.1",
 ]
 
 [project.urls]