From d0b4b6853c3d64b2f42cdd4f1acbae7cb76d5452 Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Sat, 18 Mar 2023 14:10:24 +0100
Subject: [PATCH] Move deleted/updated conflict check to fullRecursiveScan in
 FileProviderEnumerator+RemoteSync

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 .../FileProviderEnumerator+RemoteSync.swift     | 17 +++++++++++++++--
 .../FileProviderEnumerator.swift                | 15 +--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator+RemoteSync.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator+RemoteSync.swift
index d0f406755..fd5cc0cdc 100644
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator+RemoteSync.swift
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator+RemoteSync.swift
@@ -29,13 +29,26 @@ extension FileProviderEnumerator {
         dispatchQueue.async {
             let results = scanRecursively(rootContainerDirectoryMetadata, ncAccount: ncAccount, ncKit: ncKit, scanChangesOnly: scanChangesOnly)
 
+            // Run a check to ensure files deleted in one location are not updated in another (e.g. when moved)
+            // The recursive scan provides us with updated/deleted metadatas only on a folder by folder basis;
+            // so we need to check we are not simultaneously marking a moved file as deleted and updated
+            var checkedDeletedMetadatas = results.deletedMetadatas
+
+            for updatedMetadata in results.updatedMetadatas {
+                guard let matchingDeletedMetadataIdx = checkedDeletedMetadatas.firstIndex(where: { $0.ocId == updatedMetadata.ocId } ) else {
+                    continue;
+                }
+
+                checkedDeletedMetadatas.remove(at: matchingDeletedMetadataIdx)
+            }
+
             DispatchQueue.main.async {
-                completionHandler(results.metadatas, results.newMetadatas, results.updatedMetadatas, results.deletedMetadatas, results.error)
+                completionHandler(results.metadatas, results.newMetadatas, results.updatedMetadatas, checkedDeletedMetadatas, results.error)
             }
         }
     }
 
-    static func scanRecursively(_ directoryMetadata: NextcloudItemMetadataTable, ncAccount: NextcloudAccount, ncKit: NextcloudKit, scanChangesOnly: Bool) -> (metadatas: [NextcloudItemMetadataTable], newMetadatas: [NextcloudItemMetadataTable], updatedMetadatas: [NextcloudItemMetadataTable], deletedMetadatas: [NextcloudItemMetadataTable], error: NKError?) {
+    private static func scanRecursively(_ directoryMetadata: NextcloudItemMetadataTable, ncAccount: NextcloudAccount, ncKit: NextcloudKit, scanChangesOnly: Bool) -> (metadatas: [NextcloudItemMetadataTable], newMetadatas: [NextcloudItemMetadataTable], updatedMetadatas: [NextcloudItemMetadataTable], deletedMetadatas: [NextcloudItemMetadataTable], error: NKError?) {
 
         assert(directoryMetadata.directory, "Can only recursively scan a directory.")
 
diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift
index 1ae8c9abb..8068269be 100644
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift
@@ -253,25 +253,12 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
 
                 Logger.enumeration.info("Finished recursive change enumeration of working set for user: \(self.ncAccount.ncKitAccount, privacy: OSLogPrivacy.auto(mask: .hash)). Enumerating items.")
 
-                // Run a check to ensure files deleted in one location are not updated in another (e.g. when moved)
-                // The recursive scan provides us with updated/deleted metadatas only on a folder by folder basis;
-                // so we need to check we are not simultaneously marking a moved file as deleted and updated
-                var checkedDeletedMetadatas = deletedMetadatas
-
-                for updatedMetadata in updatedMetadatas {
-                    guard let matchingDeletedMetadataIdx = checkedDeletedMetadatas.firstIndex(where: { $0.ocId == updatedMetadata.ocId } ) else {
-                        continue;
-                    }
-
-                    checkedDeletedMetadatas.remove(at: matchingDeletedMetadataIdx)
-                }
-
                 FileProviderEnumerator.completeChangesObserver(observer,
                                                                anchor: anchor,
                                                                ncKit: self.ncKit,
                                                                newMetadatas: newMetadatas,
                                                                updatedMetadatas: updatedMetadatas,
-                                                               deletedMetadatas: checkedDeletedMetadatas)
+                                                               deletedMetadatas: deletedMetadatas)
             }
             return
         } else if enumeratedItemIdentifier == .trashContainer {
-- 
2.30.2