From d3a2d8fca2b598aa6f2445e5e10e6d4db67f16b2 Mon Sep 17 00:00:00 2001
From: reven <john@reven.nz>
Date: Tue, 1 Feb 2022 22:45:50 +1300
Subject: [PATCH] silently failing for delete source directory, just logs
 warning

---
 BasicNodes/BasicNodes.en.json            | 3 ++-
 BasicNodes/File/DeleteSourceDirectory.cs | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/BasicNodes/BasicNodes.en.json b/BasicNodes/BasicNodes.en.json
index d84e984d..ed8275cf 100644
--- a/BasicNodes/BasicNodes.en.json
+++ b/BasicNodes/BasicNodes.en.json
@@ -38,7 +38,8 @@
         "DeleteSourceDirectory": {
           "Label": "Delete Source Folder",
           "Outputs": {
-            "1": "Source directory deleted"
+            "1": "Source directory deleted",
+            "2": "Directory was NOT deleted"
           },
           "Description": "Deletes the source folder of the original library file",
           "Fields": {
diff --git a/BasicNodes/File/DeleteSourceDirectory.cs b/BasicNodes/File/DeleteSourceDirectory.cs
index 00d01221..89b79744 100644
--- a/BasicNodes/File/DeleteSourceDirectory.cs
+++ b/BasicNodes/File/DeleteSourceDirectory.cs
@@ -49,8 +49,8 @@ namespace FileFlows.BasicNodes.File
             }
             catch (Exception ex)
             {
-                args.Logger?.ELog("Failed to delete directory: " + ex.Message);
-                return -1;
+                args.Logger?.WLog("Failed to delete directory: " + ex.Message);
+                return Directory.Exists(pathToDelete) ? 2 : 1; // silent fail, another runner may have already deleted it, eg if processing music albums 
             }
             return base.Execute(args);
         }
@@ -112,8 +112,8 @@ namespace FileFlows.BasicNodes.File
             }
             catch (Exception ex)
             {
-                args.Logger?.ELog("Failed to delete directory: " + ex.Message);
-                return -1;
+                args.Logger?.WLog("Failed to delete directory: " + ex.Message);
+                return dir.Exists ? 2 : 1; // silenty fail
             }
 
             return RecursiveDelete(args, root, dir.Parent.FullName, false);