mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-21 12:35:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7351 from nextcloud/bugfix/alwaysRecordMovedItemsAfterServerReplied

Browse source 
on receiving reply of a remote MOVE: always record it
This commit is contained in:
Claudio Cambra 2024-10-18 10:22:09 +08:00 committed by GitHub
commit 2d300240c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libsync/discovery.cpp
View file

@ -1714,7 +1714,7 @@ void ProcessDirectoryJob::processFileFinalize(
item->_instruction = CSyncEnums::CSYNC_INSTRUCTION_UPDATE_VFS_METADATA;
}
if (path._original != path._target && (item->_instruction == CSYNC_INSTRUCTION_UPDATE_METADATA || item->_instruction == CSYNC_INSTRUCTION_NONE)) {
if (path._original != path._target && (item->_instruction == CSYNC_INSTRUCTION_UPDATE_VFS_METADATA || item->_instruction == CSYNC_INSTRUCTION_UPDATE_METADATA || item->_instruction == CSYNC_INSTRUCTION_NONE)) {
ASSERT(_dirItem && _dirItem->_instruction == CSYNC_INSTRUCTION_RENAME);
// This is because otherwise subitems are not updated! (ideally renaming a directory could
// update the database for all items! See PropagateDirectory::slotSubJobsFinished)

13
src/libsync/propagateremotemove.cpp
View file

@ -290,22 +290,17 @@ void PropagateRemoteMove::finalize()
}
}
if (!FileSystem::fileExists(targetFile)) {
propagator()->_journal->commit("Remote Rename");
done(SyncFileItem::Success, {}, ErrorCategory::NoError);
return;
}
const auto result = propagator()->updateMetadata(newItem);
if (!result) {
if (!result && QFileInfo::exists(targetFile)) {
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(newItem._file), ErrorCategory::GenericError);
return;
}
if (pinState && *pinState != PinState::Inherited
&& !vfs->setPinState(newItem._renameTarget, *pinState)) {
if (pinState && *pinState != PinState::Inherited &&
!vfs->setPinState(newItem._renameTarget, *pinState) &&
QFileInfo::exists(targetFile)) {
done(SyncFileItem::NormalError, tr("Error setting pin state"), ErrorCategory::GenericError);
return;
}