From 5a7da61cbb096a723f9ea3b031247e8647014f70 Mon Sep 17 00:00:00 2001
From: abraunegg <alex.braunegg@gmail.com>
Date: Sat, 19 Nov 2022 06:18:56 +1100
Subject: [PATCH] Fix issue of silent exit when unable to delete local files
 when using --cleanup-local-files (#2227)

* Add try blocks for performing local deletes to catch in function permission issues preventing file|folder local deletion.
---
 src/sync.d | 44 ++++++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/sync.d b/src/sync.d
index 4c197d40..5e6eb26a 100644
--- a/src/sync.d
+++ b/src/sync.d
@@ -4443,25 +4443,41 @@ final class SyncEngine
 						log.log("Removing local directory as --download-only & --cleanup-local-files configured");
 						// Remove any children of this path if they still exist
 						// Resolve 'Directory not empty' error when deleting local files
-						foreach (DirEntry child; dirEntries(path, SpanMode.depth, false)) {
-							// what sort of child is this?
-							if (isDir(child.name)) {
-								log.log("Removing local directory: ", child.name);
-							} else {
-								log.log("Removing local file: ", child.name);
+						try {
+							foreach (DirEntry child; dirEntries(path, SpanMode.depth, false)) {
+								// what sort of child is this?
+								if (isDir(child.name)) {
+									log.log("Removing local directory: ", child.name);
+								} else {
+									log.log("Removing local file: ", child.name);
+								}
+								// are we in a --dry-run scenario?
+								if (!dryRun) {
+									// No --dry-run ... process local delete
+									try {
+										attrIsDir(child.linkAttributes) ? rmdir(child.name) : remove(child.name);
+									} catch (FileException e) {
+										// display the error message
+										displayFileSystemErrorMessage(e.msg, getFunctionName!({}));
+									}
+								}
 							}
+							// Remove the path now that it is empty of children
+							log.log("Removing local directory: ", path);
 							// are we in a --dry-run scenario?
 							if (!dryRun) {
 								// No --dry-run ... process local delete
-								attrIsDir(child.linkAttributes) ? rmdir(child.name) : remove(child.name);
+								try {
+									rmdirRecurse(path);
+								} catch (FileException e) {
+									// display the error message
+									displayFileSystemErrorMessage(e.msg, getFunctionName!({}));
+								}
 							}
-						}
-						// Remove the path now that it is empty of children
-						log.log("Removing local directory: ", path);
-						// are we in a --dry-run scenario?
-						if (!dryRun) {
-							// No --dry-run ... process local delete
-							rmdirRecurse(path);
+						} catch (FileException e) {
+							// display the error message
+							displayFileSystemErrorMessage(e.msg, getFunctionName!({}));
+							return;
 						}
 					}
 				}