From 51c6c5a4ce1fe5a6b56541187caefa8746517e6f Mon Sep 17 00:00:00 2001
From: Chrystian Huot <chrystian.huot@saubeo.solutions>
Date: Wed, 20 May 2020 15:48:03 -0400
Subject: [PATCH] Fix dirWatch[].deleteAfter=true not always being deleted

---
 server/lib/rdio-scanner/dir-watch.js | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/server/lib/rdio-scanner/dir-watch.js b/server/lib/rdio-scanner/dir-watch.js
index e4590b4..900257c 100644
--- a/server/lib/rdio-scanner/dir-watch.js
+++ b/server/lib/rdio-scanner/dir-watch.js
@@ -99,10 +99,10 @@ class DirWatch {
 
                                     await metaWatcher.close();
 
-                                    let meta;
-
                                     try {
-                                        meta = JSON.parse(fs.readFileSync(metaFile, 'utf8'));
+                                        const meta = JSON.parse(fs.readFileSync(metaFile, 'utf8'));
+
+                                        await this.app.controller.importTrunkRecorder(audio, audioName, audioType, system, meta);
 
                                     } catch (error) {
                                         console.error(`Error loading file ${metaFile}`);
@@ -110,12 +110,8 @@ class DirWatch {
                                         return;
                                     }
 
-                                    if (meta) {
-                                        await this.app.controller.importTrunkRecorder(audio, audioName, audioType, system, meta);
-
-                                        if (dirWatch.deleteAfter) {
-                                            this.unlink(metaFile);
-                                        }
+                                    if (dirWatch.deleteAfter) {
+                                        this.unlink(metaFile);
                                     }
                                 });
 
@@ -138,10 +134,10 @@ class DirWatch {
 
                                     await metaWatcher.close();
 
-                                    let meta;
-
                                     try {
-                                        meta = JSON.parse(fs.readFileSync(metaFile, 'utf8'));
+                                        const meta = JSON.parse(fs.readFileSync(metaFile, 'utf8'));
+
+                                        await this.app.controller.importSdrtrunk(audio, audioName, audioType, system, meta);
 
                                     } catch (error) {
                                         console.error(`Error loading file ${metaFile}`);
@@ -149,8 +145,6 @@ class DirWatch {
                                         return;
                                     }
 
-                                    await this.app.controller.importSdrtrunk(audio, audioName, audioType, system, meta);
-
                                     if (dirWatch.deleteAfter) {
                                         this.unlink(metaFile);
                                     }
@@ -185,7 +179,7 @@ class DirWatch {
 
     unlink(filename) {
         try {
-            fs.unlinkSync(filename);
+            setTimeout(() => fs.unlinkSync(filename), 1000);
 
         } catch (error) {
             console.error(`Unable to delete ${filename}`);