From ba025dc1e4030cdfbd9a387078c67a8eb9b0401e Mon Sep 17 00:00:00 2001
From: Chrystian Huot <chrystian.huot@saubeo.solutions>
Date: Wed, 3 Jun 2020 15:42:14 -0400
Subject: [PATCH] More precise error message to DirWatch when failing to import
 from trunk-recorder

---
 server/lib/rdio-scanner/dir-watch.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/server/lib/rdio-scanner/dir-watch.js b/server/lib/rdio-scanner/dir-watch.js
index e392d0e..8e91153 100644
--- a/server/lib/rdio-scanner/dir-watch.js
+++ b/server/lib/rdio-scanner/dir-watch.js
@@ -132,9 +132,18 @@ class DirWatch {
 
                 const system = this.parseRegex(dirWatch.system, filename);
 
-                try {
-                    const meta = JSON.parse(this.readFile(filename, 'utf8'));
+                let meta;
 
+                try {
+                    meta = JSON.parse(this.readFile(filename, 'utf8'));
+
+                } catch (error) {
+                    console.error(`DirWatch: Error parsing json file ${filename}`);
+
+                    return;
+                }
+
+                try {
                     await this.app.controller.importTrunkRecorder(audio, audioName, audioType, system, meta);
 
                     if (dirWatch.deleteAfter) {
@@ -144,10 +153,15 @@ class DirWatch {
                     }
 
                 } catch (error) {
-                    console.error(`DirWatch: Error loading file ${filename}`);
+                    console.error(`DirWatch: Error importing file ${audioFile}`);
 
                     return;
                 }
+
+            } else {
+                console.error(`DirWatch: Error missing file ${audioFile}`);
+
+                return;
             }
         }
     }