From 00ce7eed0e3bf73e21f7f495a22e0c9050c007ec Mon Sep 17 00:00:00 2001
From: abraunegg <alex.braunegg@gmail.com>
Date: Mon, 27 Mar 2023 17:22:48 +1100
Subject: [PATCH] Fix that folders are renamed despite using --dry-run (#2343)

* Fix that folders are renamed despite using --dry-run
---
 src/sync.d | 43 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/sync.d b/src/sync.d
index 8677b135..60e731d4 100644
--- a/src/sync.d
+++ b/src/sync.d
@@ -231,8 +231,10 @@ final class SyncEngine
 	private string[] skippedItems;
 	// list of items to delete after the changes has been downloaded
 	private string[2][] idsToDelete;
-	// list of items we fake created when running --dry-run
+	// list of items we fake created when using --dry-run
 	private string[2][] idsFaked;
+	// list of directory names changed online, but not changed locally when using --dry-run
+	private string[] pathsRenamed;
 	// default drive id
 	private string defaultDriveId;
 	// default root id
@@ -1802,7 +1804,7 @@ final class SyncEngine
 								// are there any delta changes?
 								if (("value" in changesAvailable) != null) {
 									deltaChanges = count(changesAvailable["value"].array);
-									log.log("changesAvailable query reports that there are " , deltaChanges , " changes that need processing on OneDrive");
+									log.vdebug("changesAvailable query reports that there are " , deltaChanges , " changes that need processing on OneDrive");
 								}
 							}
 						} catch (OneDriveException e) {
@@ -2907,20 +2909,32 @@ final class SyncEngine
 						} else {
 							// TODO: force remote sync by deleting local item
 							log.vlog("The destination is occupied, renaming the conflicting file...");
-							safeRename(newPath);
+							if (!dryRun) {
+								safeRename(newPath);
+							}
 						}
 					} else {
 						// to be overwritten item is not already in the itemdb, so it should
 						// be synced. Do a safe rename here, too.
 						// TODO: force remote sync by deleting local item
 						log.vlog("The destination is occupied by new file, renaming the conflicting file...");
-						safeRename(newPath);
+						if (!dryRun) {
+							safeRename(newPath);
+						}
 					}
 				}
 				// try and rename path, catch exception
 				try {
 					log.vdebug("Calling rename(oldPath, newPath)");
-					rename(oldPath, newPath);
+					if (!dryRun) {
+						// rename physical path on disk
+						rename(oldPath, newPath);
+					} else {
+						// track this as a faked id item
+						idsFaked ~= [newItem.driveId, newItem.id];
+						// we also need to track that we did not rename this path
+						pathsRenamed ~= [oldPath];
+					}
 				} catch (FileException e) {
 					// display the error message
 					displayFileSystemErrorMessage(e.msg, getFunctionName!({}));
@@ -4449,8 +4463,23 @@ final class SyncEngine
 				log.logAndNotify("Skipping item - invalid name (Microsoft Naming Convention): ", path);
 				return;
 			}
-
-			// We want to upload this new item
+			
+			// If we are in a --dry-run scenario, we may have renamed a folder - but it is technically not renamed locally
+			// Thus, that entire path may be attemtped to be uploaded as new data to OneDrive
+			if (dryRun) {
+				// check the pathsRenamed array for this path
+				// if any match - we need to exclude this path
+				foreach (thisRenamedPath; pathsRenamed) {
+					log.vdebug("Renamed Path to evaluate: ", thisRenamedPath);
+					// Can we find 'thisRenamedPath' in the given 'path'
+					if (canFind(path, thisRenamedPath)) {
+						log.vdebug("Renamed Path MATCH - DONT UPLOAD AS NEW");
+						return;
+					}
+				}
+			}
+			
+			// We want to upload this new local data
 			if (isDir(path)) {
 				Item item;
 				bool pathFoundInDB = false;