From 111cf792d153c7aaa73b99a5edfb3f6714a002ca Mon Sep 17 00:00:00 2001
From: alex-z <blackslayer4@gmail.com>
Date: Mon, 13 Nov 2023 19:46:27 +0100
Subject: [PATCH] Iteration. Fixing tests.

Signed-off-by: alex-z <blackslayer4@gmail.com>
---
 src/libsync/owncloudpropagator.cpp | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index 1592d7920ad52..09d4d67872d9c 100644
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -500,6 +500,10 @@ void OwncloudPropagator::cleanupLocallyMovedFoldersFromNestedItems(SyncFileItemV
             return false;
         }
 
+        if (item->isDirectory()) {
+            return false;
+        }
+
         // remove only children of previousFolderPath, not previousFolderPath itself such that parent always remains in the vector
         return item->_originalFile.startsWith(previousFolderPath);
     });
@@ -547,9 +551,31 @@ void OwncloudPropagator::start(SyncFileItemVector &&items)
 
     // process each item that is new and is a directory and make sure every parent in its tree has the instruction NEW instead of REMOVE
     adjustDeletedFoldersWithNewChildren(items);
+    qCInfo(lcPropagator) << "BEGIN ITEMS CLEANUP";
+    for (const auto &item : items) {
+        qCInfo(lcPropagator) << "item->_originalFile:"
+                             << item->_originalFile
+                             << "item->_renameTarget"
+                             << item->_renameTarget
+                             << "item->_direction"
+                             << item->_direction;
+    }
 
     // when a folder is moved on the local device we only need to perform one MOVE on the server and then just update database, so we only keep unique moves (topmost moved folder items)
-    cleanupLocallyMovedFoldersFromNestedItems(items);
+    bool isCleanup = true;
+    if (isCleanup) {
+        cleanupLocallyMovedFoldersFromNestedItems(items);
+    }
+
+    qCInfo(lcPropagator) << "END ITEMS CLEANUP";
+    for (const auto &item : items) {
+        qCInfo(lcPropagator) << "item->_originalFile:"
+                             << item->_originalFile
+                             << "item->_renameTarget"
+                             << item->_renameTarget
+                             << "item->_direction"
+                             << item->_direction;
+    }
 
     resetDelayedUploadTasks();
     _rootJob.reset(new PropagateRootDirectory(this));