mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 06:45:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

New discovery algorithm: Fix directory deletion

Browse source 
TestAllFilesDeleted passes
This commit is contained in:
Olivier Goffart 2018-07-17 10:09:57 +02:00 committed by Kevin Ottens
parent d54e00488a
commit 22d989e272
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libsync/discovery.h
View file

@ -85,6 +85,8 @@ public:
void start(); void start();
void abort(); void abort();
SyncFileItemPtr _dirItem;
private: private:
struct PathTuple struct PathTuple
{ {
@ -121,7 +123,6 @@ private:
QPointer<DiscoverServerJob> _serverJob; QPointer<DiscoverServerJob> _serverJob;
std::deque<ProcessDirectoryJob *> _queuedJobs; std::deque<ProcessDirectoryJob *> _queuedJobs;
QVector<ProcessDirectoryJob *> _runningJobs; QVector<ProcessDirectoryJob *> _runningJobs;
SyncFileItemPtr _dirItem;
QueryMode _queryServer; QueryMode _queryServer;
QueryMode _queryLocal; QueryMode _queryLocal;
DiscoveryPhase *_discoveryData; DiscoveryPhase *_discoveryData;

14
src/libsync/syncengine.cpp
View file

@ -925,7 +925,9 @@ void SyncEngine::slotStartDiscovery()
_discoveryPhase.data(), this); _discoveryPhase.data(), this);
// FIXME! this sucks // FIXME! this sucks
auto runQueuedJob = [this](ProcessDirectoryJob *job, const auto &runQueuedJob) -> void { auto runQueuedJob = [this](ProcessDirectoryJob *job, const auto &runQueuedJob) -> void {
connect(job, &ProcessDirectoryJob::finished, this, [this, runQueuedJob] { connect(job, &ProcessDirectoryJob::finished, this, [this, job, runQueuedJob] {
if (job->_dirItem)
job->itemDiscovered(job->_dirItem);
sender()->deleteLater(); sender()->deleteLater();
if (!_discoveryPhase->_queuedDeletedDirectories.isEmpty()) { if (!_discoveryPhase->_queuedDeletedDirectories.isEmpty()) {
auto job = qobject_cast<ProcessDirectoryJob *>(_discoveryPhase->_queuedDeletedDirectories.take(_discoveryPhase->_queuedDeletedDirectories.firstKey()).data()); auto job = qobject_cast<ProcessDirectoryJob *>(_discoveryPhase->_queuedDeletedDirectories.take(_discoveryPhase->_queuedDeletedDirectories.firstKey()).data());
@ -1012,18 +1014,11 @@ void SyncEngine::slotDiscoveryJobFinished()
// qCInfo(lcEngine) << "Permissions of the root folder: " << _csync_ctx->remote.root_perms.toString(); // qCInfo(lcEngine) << "Permissions of the root folder: " << _csync_ctx->remote.root_perms.toString();
/*
// Adjust the paths for the renames.
for (const auto &syncItem : qAsConst(syncItems)) {
syncItem->_file = adjustRenamedPath(syncItem->_file);
}
ConfigFile cfgFile; ConfigFile cfgFile;
if (!_hasNoneFiles && _hasRemoveFile && cfgFile.promptDeleteFiles()) { if (!_hasNoneFiles && _hasRemoveFile && cfgFile.promptDeleteFiles()) {
qCInfo(lcEngine) << "All the files are going to be changed, asking the user"; qCInfo(lcEngine) << "All the files are going to be changed, asking the user";
bool cancel = false; bool cancel = false;
emit aboutToRemoveAllFiles(syncItems.first()->_direction, &cancel); emit aboutToRemoveAllFiles(_syncItems.first()->_direction, &cancel);
if (cancel) { if (cancel) {
qCInfo(lcEngine) << "User aborted sync"; qCInfo(lcEngine) << "User aborted sync";
finalize(false); finalize(false);
@ -1031,6 +1026,7 @@ void SyncEngine::slotDiscoveryJobFinished()
} }
} }
/*
auto databaseFingerprint = _journal->dataFingerprint(); auto databaseFingerprint = _journal->dataFingerprint();
// If databaseFingerprint is empty, this means that there was no information in the database // If databaseFingerprint is empty, this means that there was no information in the database
// (for example, upgrading from a previous version, or first sync, or server not supporting fingerprint) // (for example, upgrading from a previous version, or first sync, or server not supporting fingerprint)