mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix local rename.

Browse Source
This commit is contained in:
Klaas Freitag 2013-11-05 17:50:09 +01:00
parent 3a21edca2b
commit 5cd2be058d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mirall/owncloudpropagator.cpp
View File

@ -696,10 +696,15 @@ void PropagateLocalRename::start()
_item._instruction = CSYNC_INSTRUCTION_DELETED;
_propagator->_journal->deleteFileRecord(_item._originalFile);
SyncJournalFileRecord record(_item, _propagator->_remoteDir + _item._file);
// store the rename file name in the item.
_item._file = _item._renameTarget;
SyncJournalFileRecord record(_item, _propagator->_localDir + _item._renameTarget);
record._path = _item._renameTarget;
_propagator->_journal->setFileRecord(record);
emit progress(Progress::EndDownload, _item._file, 0, _item._size);
done(SyncFileItem::Success);
}
@ -741,6 +746,7 @@ void PropagateRemoteRename::start()
_propagator->_journal->deleteFileRecord(_item._originalFile);
SyncJournalFileRecord record(_item, _propagator->_localDir + _item._renameTarget);
record._path = _item._renameTarget;
_propagator->_journal->setFileRecord(record);
done(SyncFileItem::Success);
}
@ -902,6 +908,10 @@ void PropagateDirectory::proceedNext(SyncFileItem::Status status)
startJob(next);
} else {
if (!_item.isEmpty() && !_hasError) {
if( !_item._renameTarget.isEmpty() ) {
_item._file = _item._renameTarget;
}
SyncJournalFileRecord record(_item, _propagator->_localDir + _item._file);
_propagator->_journal->setFileRecord(record);
}