From ccf38f2df405b9cd2a01b325643b534abc9969d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zo=C3=AB=20Hoekstra?= <altlockg@gmail.com>
Date: Thu, 25 Aug 2022 19:52:43 +0200
Subject: [PATCH] Fix folder watching and push message

---
 src/fileWatch.js                    | 7 ++++---
 src/networking/messageGenerators.js | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/fileWatch.js b/src/fileWatch.js
index c5ad623..4ae6ea9 100644
--- a/src/fileWatch.js
+++ b/src/fileWatch.js
@@ -15,13 +15,14 @@ export async function setupWatch(signaller) {
 
     const watch = new CheapWatch({
         dir: config.get("scriptsFolder"),
-        filter: fileFilter
+        filter: fileFilter,
+        watch: !config.get("dry")
     });
 
     if(!config.get("quiet")) console.log("Watching folder", resolve(config.get("scriptsFolder")))
 
-    watch.on('+', fileEvent => signaller.emit(EventType.FileChanged, fileEvent));
-    watch.on('-', fileEvent => signaller.emit(EventType.FileDeleted, fileEvent));
+    watch.on('+', fileEvent => {if (fileEvent.stats.isFile()) signaller.emit(EventType.FileChanged, fileEvent)});
+    watch.on('-', fileEvent => {if (fileEvent.stats.isFile()) signaller.emit(EventType.FileDeleted, fileEvent)});
 
     // Wait 'till filewatcher is ready to go
     await watch.init();
diff --git a/src/networking/messageGenerators.js b/src/networking/messageGenerators.js
index 9885ecb..9f270b4 100644
--- a/src/networking/messageGenerators.js
+++ b/src/networking/messageGenerators.js
@@ -10,7 +10,7 @@ export function fileChangeEventToMsg({path}){
         "method":"pushFile",
         "params":{
             "server":"home",
-            "filename":path,
+            "filename":"/"+path,
             "content":readFileSync(join(config.get("scriptsFolder"), path)).toString()
         },
         "id":messageCounter++