From 0dcc76f9f1a0a7a5574c2c12a7722b8f41b5dc11 Mon Sep 17 00:00:00 2001 From: abraunegg Date: Thu, 18 Mar 2021 13:24:26 +1100 Subject: [PATCH] Update 'Skipping shared folder due to existing name conflict' check for Business Shared Folders (#1351) * Update 'Skipping shared folder due to existing name conflict' check for Business Shared Folders --- src/sync.d | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/sync.d b/src/sync.d index 7345e136..c8d781cb 100644 --- a/src/sync.d +++ b/src/sync.d @@ -639,9 +639,12 @@ final class SyncEngine // for each driveid in the existing driveIDsArray foreach (searchDriveId; driveIDsArray) { log.vdebug("searching database for: ", searchDriveId, " ", sharedFolderName); - if (itemdb.selectByPath(sharedFolderName, searchDriveId, databaseItem)) { + if (itemdb.idInLocalDatabase(searchDriveId, searchResult["remoteItem"]["id"].str)){ + // Shared folder is present log.vdebug("Found shared folder name in database"); itemInDatabase = true; + // Query the DB for the details of this item + itemdb.selectByPath(sharedFolderName, searchDriveId, databaseItem); log.vdebug("databaseItem: ", databaseItem); // Does the databaseItem.driveId == defaultDriveId? if (databaseItem.driveId == defaultDriveId) {