From da920f6d4e26f06d94820f34be94945685cbfcb3 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Tue, 30 Apr 2024 13:31:54 +0200 Subject: [PATCH 1/2] ensure proper VFS metadata when restoring folders when remote move is forbidden, desktop client will move back the folder to its original name in such cases, we were forgetting to set VFS metadata in their proper state (i.e. placeholder in sync) so ensure that when a remote move fails, we still touch VFS metadata when appropriate and handle errors Signed-off-by: Matthieu Gallien --- src/libsync/propagateremotemove.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/libsync/propagateremotemove.cpp b/src/libsync/propagateremotemove.cpp index 401a8f27bf124..6d2c0a229b047 100644 --- a/src/libsync/propagateremotemove.cpp +++ b/src/libsync/propagateremotemove.cpp @@ -217,7 +217,19 @@ void PropagateRemoteMove::slotMoveJobFinished() qCWarning(lcPropagateRemoteMove) << "Could not MOVE file" << filePathOriginal << " to" << filePath << " with error:" << _job->errorString() << " and successfully restored it."; + + auto restoredItem = *_item; + restoredItem._renameTarget = _item->_originalFile; + const auto result = propagator()->updateMetadata(restoredItem); + if (!result) { + done(SyncFileItem::FatalError, tr("Error updating metadata: %1").arg(result.error()), ErrorCategory::GenericError); + return; + } else if (*result == Vfs::ConvertToPlaceholderResult::Locked) { + done(SyncFileItem::SoftError, tr("The file %1 is currently in use").arg(restoredItem._file), ErrorCategory::GenericError); + return; + } } + done(status, _job->errorString(), ErrorCategory::GenericError); return; } From 7a6691f6e04a62fdbd0b9573ca5a2f59af7e8633 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Tue, 30 Apr 2024 13:33:58 +0200 Subject: [PATCH 2/2] as a last resort, try to update VFS metadata of folders when discovered when doing local discovery, it is possible that files or folders may be discovered with VFS metadata not up to date (i.e. placeholder file not set in sync) in such case, generate a propagation instruction to set them in sync Signed-off-by: Matthieu Gallien --- src/libsync/discovery.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp index efb221c150e3a..6eb2eefd755e1 100644 --- a/src/libsync/discovery.cpp +++ b/src/libsync/discovery.cpp @@ -1719,7 +1719,7 @@ void ProcessDirectoryJob::processFileFinalize( } if (_discoveryData->_syncOptions._vfs && - item->_type == CSyncEnums::ItemTypeFile && + (item->_type == CSyncEnums::ItemTypeFile || item->_type == CSyncEnums::ItemTypeDirectory) && item->_instruction == CSyncEnums::CSYNC_INSTRUCTION_NONE && !_discoveryData->_syncOptions._vfs->isPlaceHolderInSync(_discoveryData->_localDir + path._local)) { item->_instruction = CSyncEnums::CSYNC_INSTRUCTION_UPDATE_VFS_METADATA;