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

Ensure file modification time is set if item modtime differs from journal modtime

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2023-07-10 13:00:28 +08:00
parent 961033efc1
commit 4681d27de5
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libsync/syncengine.cpp
View file

@ -388,8 +388,7 @@ void OCC::SyncEngine::slotItemDiscovered(const OCC::SyncFileItemPtr &item)
} }
// Update on-disk virtual file metadata // Update on-disk virtual file metadata
if (modificationHappened) { if (modificationHappened && item->_type == ItemTypeVirtualFile) {
if (item->_type == ItemTypeVirtualFile) {
auto r = _syncOptions._vfs->updateMetadata(filePath, item->_modtime, item->_size, item->_fileId); auto r = _syncOptions._vfs->updateMetadata(filePath, item->_modtime, item->_size, item->_fileId);
if (!r) { if (!r) {
item->_status = SyncFileItem::Status::NormalError; item->_status = SyncFileItem::Status::NormalError;
@ -398,7 +397,8 @@ void OCC::SyncEngine::slotItemDiscovered(const OCC::SyncFileItemPtr &item)
emit itemCompleted(item, ErrorCategory::GenericError); emit itemCompleted(item, ErrorCategory::GenericError);
return; return;
} }
} else if (!FileSystem::setModTime(filePath, item->_modtime)) { } else if (modificationHappened || prev._modtime != item->_modtime) {
if (!FileSystem::setModTime(filePath, item->_modtime)) {
item->_instruction = CSYNC_INSTRUCTION_ERROR; item->_instruction = CSYNC_INSTRUCTION_ERROR;
item->_errorString = tr("Could not update file metadata: %1").arg(filePath); item->_errorString = tr("Could not update file metadata: %1").arg(filePath);
emit itemCompleted(item, ErrorCategory::GenericError); emit itemCompleted(item, ErrorCategory::GenericError);