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
This commit is contained in:
abraunegg 2021-03-18 13:24:26 +11:00 committed by GitHub
parent 037a6b43e1
commit 0dcc76f9f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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) {