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

More fix for moving shared directories

Browse Source 
Abort a directory job if the first job fails

Also make sure the jobs are in the directory job of their destination paths
This commit is contained in:
Olivier Goffart 2014-02-19 13:06:55 +01:00
parent e4965ab06b
commit a51f050a08
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mirall/owncloudpropagator.cpp
View File

@ -895,6 +895,8 @@ void PropagateLocalRename::start()
void PropagateRemoteRename::start()
{
qDebug() << Q_FUNC_INFO << _item._file << "-->"<< _item._renameTarget;
if (_item._file == _item._renameTarget) {
if (!_item._isDirectory) {
// The parents has been renamed already so there is nothing more to do.
@ -1061,7 +1063,7 @@ void OwncloudPropagator::start(const SyncFileItemVector& _syncedItems)
continue;
}
while (!item._file.startsWith(directories.top().first)) {
while (!item.destination().startsWith(directories.top().first)) {
directories.pop();
}
@ -1075,7 +1077,7 @@ void OwncloudPropagator::start(const SyncFileItemVector& _syncedItems)
} else {
directories.top().second->append(dir);
}
directories.push(qMakePair(item._file + "/" , dir));
directories.push(qMakePair(item.destination() + "/" , dir));
} else if (PropagateItemJob* current = createJob(item)) {
directories.top().second->append(current);
}
@ -1126,7 +1128,7 @@ void PropagateDirectory::start()
void PropagateDirectory::proceedNext(SyncFileItem::Status status)
{
if (status == SyncFileItem::FatalError) {
if (status == SyncFileItem::FatalError || (_current == -1 && status != SyncFileItem::Success)) {
emit finished(status);
return;
} else if (status == SyncFileItem::NormalError || status == SyncFileItem::SoftError) {