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

tidy code to fix review comments

Browse Source 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
Matthieu Gallien 2022-11-18 09:11:41 +01:00
parent 2742c6a5a1
commit 37c867bf30
No known key found for this signature in database
GPG Key ID: 7D0F74F05C22F553
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/libsync/propagatorjobs.cpp
View File

@ -264,31 +264,10 @@ void PropagateLocalRename::start()
return;
}
const auto deleteOldRecord = [this] (const QString &fileName) -> bool
{
SyncJournalFileRecord oldRecord;
if (!propagator()->_journal->getFileRecord(fileName, &oldRecord)) {
qCWarning(lcPropagateLocalRename) << "could not get file from local DB" << fileName;
done(SyncFileItem::NormalError, tr("could not get file %1 from local DB").arg(fileName));
return false;
}
if (!propagator()->_journal->deleteFileRecord(fileName)) {
qCWarning(lcPropagateLocalRename) << "could not delete file from local DB" << fileName;
done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(fileName));
return false;
}
return true;
};
if (fileAlreadyMoved) {
if (!deleteOldRecord(previousNameInDb)) {
return;
}
} else {
if (!deleteOldRecord(_item->_originalFile)) {
return;
}
if (fileAlreadyMoved && !deleteOldDbRecord(previousNameInDb)) {
return;
} else if (!deleteOldDbRecord(_item->_originalFile)) {
return;
}
auto &vfs = propagator()->syncOptions()._vfs;
@ -363,4 +342,21 @@ void PropagateLocalRename::start()
done(SyncFileItem::Success);
}
bool PropagateLocalRename::deleteOldDbRecord(const QString &fileName)
{
SyncJournalFileRecord oldRecord;
if (!propagator()->_journal->getFileRecord(fileName, &oldRecord)) {
qCWarning(lcPropagateLocalRename) << "could not get file from local DB" << fileName;
done(SyncFileItem::NormalError, tr("could not get file %1 from local DB").arg(fileName));
return false;
}
if (!propagator()->_journal->deleteFileRecord(fileName)) {
qCWarning(lcPropagateLocalRename) << "could not delete file from local DB" << fileName;
done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(fileName));
return false;
}
return true;
}
}

4
src/libsync/propagatorjobs.h
View File

@ -89,5 +89,9 @@ public:
PropagateLocalRename(OwncloudPropagator *propagator, const SyncFileItemPtr &item);
void start() override;
JobParallelism parallelism() override { return _item->isDirectory() ? WaitForFinished : FullParallelism; }
private:
bool deleteOldDbRecord(const QString &fileName);
};
}

6
src/libsync/syncengine.cpp
View File

@ -586,9 +586,9 @@ void SyncEngine::startSync()
if (!_discoveryPhase->_remoteFolder.endsWith('/'))
_discoveryPhase->_remoteFolder+='/';
_discoveryPhase->_syncOptions = _syncOptions;
_discoveryPhase->_shouldDiscoverLocaly = [this](const QString &s) {
const auto result = shouldDiscoverLocally(s);
qCInfo(lcEngine) << "shouldDiscoverLocaly" << s << (result ? "true" : "false");
_discoveryPhase->_shouldDiscoverLocaly = [this](const QString &path) {
const auto result = shouldDiscoverLocally(path);
qCInfo(lcEngine) << "shouldDiscoverLocaly" << path << (result ? "true" : "false");
return result;
};
_discoveryPhase->setSelectiveSyncBlackList(selectiveSyncBlackList);