From 868dd3f6aef43a1fb0732eb4bd5236b95abe708a Mon Sep 17 00:00:00 2001
From: Alex Palaistras <alex@deuill.org>
Date: Sun, 18 Jun 2023 21:43:35 +0100
Subject: [PATCH] Use local Slidge Core mount for development

Core changes are reflected in our development containers via a
locally-cloned `slidge` repository, adjacent to this repository.
---
 Dockerfile         |  2 +-
 README.md          |  1 +
 docker-compose.yml |  1 +
 watcher.py         | 12 +++++++-----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8c59264..e4ea97f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,7 @@ ENV SLIDGE_LEGACY_MODULE=slidge_whatsapp
 COPY ./watcher.py /
 USER root
 
-ENTRYPOINT ["python", "/watcher.py", "/venv/lib/python/site-packages/slidge_whatsapp"]
+ENTRYPOINT ["python", "/watcher.py", "/venv/lib/python/site-packages/slidge:/venv/lib/python/site-packages/slidge_whatsapp"]
 
 # wheel builder
 # docker buildx build . --target wheel \
diff --git a/README.md b/README.md
index 7fc5346..2019949 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@ For the bleeding edge, download artifacts of
 ## Dev
 
 ```sh
+git clone https://git.sr.ht/~nicoco/slidge
 git clone https://git.sr.ht/~nicoco/slidge-whatsapp
 cd slidge-whatsapp
 docker-compose up
diff --git a/docker-compose.yml b/docker-compose.yml
index caf4d71..f71d802 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,7 @@ services:
      - --debug
     network_mode: service:prosody
     volumes:
+      - ../slidge/slidge:/venv/lib/python/site-packages/slidge
       - ./slidge_whatsapp:/venv/lib/python/site-packages/slidge_whatsapp
       - ./persistent:/var/lib/slidge
     depends_on:
diff --git a/watcher.py b/watcher.py
index 9d0a261..ee37935 100755
--- a/watcher.py
+++ b/watcher.py
@@ -27,14 +27,16 @@ if __name__ == "__main__":
     )
 
     path = sys.argv[1] if len(sys.argv) > 1 else "."
-    observer.schedule(auto_restart, path, recursive=True)
-    observer.schedule(gopy_build, path, recursive=True)
+    for p in path.split(":"):
+        observer.schedule(auto_restart, p, recursive=True)
+        observer.schedule(gopy_build, p, recursive=True)
     observer.start()
 
     try:
-        for dirpath, _, filenames in os.walk(path):
-            if "go.mod" in filenames:
-                subprocess.run(gopy_cmd, shell=True, cwd=dirpath)
+        for p in path.split(":"):
+            for dirpath, _, filenames in os.walk(p):
+                if "go.mod" in filenames:
+                    subprocess.run(gopy_cmd, shell=True, cwd=dirpath)
         auto_restart.start()
         while observer.is_alive():
             observer.join(1)