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

New Discovery algorithm: Refactor a bit the way the signal are emited

Browse source
This commit is contained in:
Olivier Goffart 2018-08-06 12:41:59 +02:00 committed by Kevin Ottens
parent 8f3ce6e520
commit a36ed56f01
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2
6 changed files with 39 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/libsync/discovery.cpp
View file

@ -139,7 +139,7 @@ void ProcessDirectoryJob::start()
item->_instruction = CSYNC_INSTRUCTION_IGNORE;
item->_status = SyncFileItem::NormalError;
item->_errorString = tr("Filename encoding is not valid");
emit itemDiscovered(item);
emit _discoveryData->itemDiscovered(item);
continue;
}
i.modtime = dirent->modtime;
@ -351,7 +351,7 @@ bool ProcessDirectoryJob::handleExcluded(const QString &path, bool isDirectory,
}
_childIgnored = true;
emit itemDiscovered(item);
emit _discoveryData->itemDiscovered(item);
return true;
}
@ -558,11 +558,10 @@ void ProcessDirectoryJob::processFile(PathTuple path,
item->_instruction == CSYNC_INSTRUCTION_RENAME ? NormalQuery : ParentDontExist,
_discoveryData, this);
job->_currentFolder = path;
connect(job, &ProcessDirectoryJob::itemDiscovered, this, &ProcessDirectoryJob::itemDiscovered);
connect(job, &ProcessDirectoryJob::finished, this, &ProcessDirectoryJob::subJobFinished);
_queuedJobs.push_back(job);
} else {
emit itemDiscovered(item);
emit _discoveryData->itemDiscovered(item);
}
_pendingAsyncJobs--;
progress();
@ -815,7 +814,7 @@ void ProcessDirectoryJob::processFile(PathTuple path,
isMove = false;
}
}
if (auto deleteJob = static_cast<ProcessDirectoryJob *>(_discoveryData->_queuedDeletedDirectories.value(originalPath).data())) {
if (auto deleteJob = _discoveryData->_queuedDeletedDirectories.value(originalPath)) {
oldEtag = deleteJob->_dirItem->_etag;
delete _discoveryData->_queuedDeletedDirectories.take(originalPath);
}
@ -866,11 +865,10 @@ void ProcessDirectoryJob::processFile(PathTuple path,
if (recurse && item->isDirectory()) {
auto job = new ProcessDirectoryJob(item, recurseQueryServer, NormalQuery, _discoveryData, this);
job->_currentFolder = path;
connect(job, &ProcessDirectoryJob::itemDiscovered, this, &ProcessDirectoryJob::itemDiscovered);
connect(job, &ProcessDirectoryJob::finished, this, &ProcessDirectoryJob::subJobFinished);
_queuedJobs.push_back(job);
} else {
emit itemDiscovered(item);
emit _discoveryData->itemDiscovered(item);
}
_pendingAsyncJobs--;
progress();
@ -964,7 +962,6 @@ void ProcessDirectoryJob::processFile(PathTuple path,
job->setParent(_discoveryData);
_discoveryData->_queuedDeletedDirectories[path._original] = job;
} else {
connect(job, &ProcessDirectoryJob::itemDiscovered, this, &ProcessDirectoryJob::itemDiscovered);
connect(job, &ProcessDirectoryJob::finished, this, &ProcessDirectoryJob::subJobFinished);
_queuedJobs.push_back(job);
}
@ -972,7 +969,7 @@ void ProcessDirectoryJob::processFile(PathTuple path,
if (item->_instruction == CSYNC_INSTRUCTION_REMOVE) {
_discoveryData->_deletedItem[path._original] = item;
}
emit itemDiscovered(item);
emit _discoveryData->itemDiscovered(item);
}
}
@ -1000,11 +997,10 @@ void ProcessDirectoryJob::processBlacklisted(const PathTuple &path, const OCC::L
if (item->isDirectory() && item->_instruction != CSYNC_INSTRUCTION_IGNORE) {
auto job = new ProcessDirectoryJob(item, InBlackList, NormalQuery, _discoveryData, this);
job->_currentFolder = path;
connect(job, &ProcessDirectoryJob::itemDiscovered, this, &ProcessDirectoryJob::itemDiscovered);
connect(job, &ProcessDirectoryJob::finished, this, &ProcessDirectoryJob::subJobFinished);
_queuedJobs.push_back(job);
} else {
emit itemDiscovered(item);
emit _discoveryData->itemDiscovered(item);
}
}
@ -1089,7 +1085,7 @@ void ProcessDirectoryJob::subJobFinished()
_childModified |= job->_childModified;
if (job->_dirItem)
emit itemDiscovered(job->_dirItem);
emit _discoveryData->itemDiscovered(job->_dirItem);
int count = _runningJobs.removeAll(job);
ASSERT(count == 1);
@ -1131,11 +1127,6 @@ void ProcessDirectoryJob::progress()
emit finished();
}
}
void ProcessDirectoryJob::abort()
{
// This should delete all the sub jobs, and so abort everything
deleteLater();
}
void ProcessDirectoryJob::dbError()
{

2
src/libsync/discovery.h
View file

@ -46,7 +46,6 @@ public:
{
}
void start();
void abort();
SyncFileItemPtr _dirItem;
@ -102,7 +101,6 @@ private:
bool _childIgnored = false; // The directory contains ignored item that would prevent deletion
signals:
void itemDiscovered(const SyncFileItemPtr &item);
void finished();
};
}

17
src/libsync/discoveryphase.cpp
View file

@ -13,6 +13,7 @@
*/
#include "discoveryphase.h"
#include "discovery.h"
#include "account.h"
#include "common/asserts.h"
@ -145,6 +146,22 @@ QString DiscoveryPhase::adjustRenamedPath(const QString &original) const
return original;
}
void DiscoveryPhase::startJob(ProcessDirectoryJob *job)
{
connect(job, &ProcessDirectoryJob::finished, this, [this, job] {
if (job->_dirItem)
emit itemDiscovered(job->_dirItem);
job->deleteLater();
if (!_queuedDeletedDirectories.isEmpty()) {
auto nextJob = _queuedDeletedDirectories.take(_queuedDeletedDirectories.firstKey());
startJob(nextJob);
} else {
emit finished();
}
});
job->start();
}
/* FIXME (used to be called every time we were doing a propfind)
void DiscoveryJob::update_job_update_callback(bool local,
const char *dirUrl,

8
src/libsync/discoveryphase.h
View file

@ -39,6 +39,7 @@ enum class LocalDiscoveryStyle {
class Account;
class SyncJournalDb;
class ProcessDirectoryJob;
struct RemoteInfo
@ -140,13 +141,16 @@ public:
bool checkSelectiveSyncNewFolder(const QString &path, RemotePermissions rp);
QMap<QString, SyncFileItemPtr> _deletedItem;
QMap<QString, QPointer<QObject>> _queuedDeletedDirectories;
QMap<QString, ProcessDirectoryJob *> _queuedDeletedDirectories;
QMap<QString, QString> _renamedItems; // map source -> destinations
QString adjustRenamedPath(const QString &original) const;
void startJob(ProcessDirectoryJob *);
signals:
void fatalError(const QString &errorString);
void folderDiscovered(bool local, QString folderUrl);
void itemDiscovered(const SyncFileItemPtr &item);
void finished();
// A new folder was discovered and was not synced because of the confirmation feature
void newBigFolder(const QString &folder, bool isExternal);

31
src/libsync/syncengine.cpp
View file

@ -602,33 +602,17 @@ void SyncEngine::slotStartDiscovery()
_discoveryPhase->_invalidFilenamePattern = invalidFilenamePattern;
_discoveryPhase->_ignoreHiddenFiles = ignoreHiddenFiles();
connect(_discoveryPhase.data(), &DiscoveryPhase::folderDiscovered, this, &SyncEngine::slotFolderDiscovered);
connect(_discoveryPhase.data(), &DiscoveryPhase::itemDiscovered, this, &SyncEngine::slotItemDiscovered);
connect(_discoveryPhase.data(), &DiscoveryPhase::newBigFolder, this, &SyncEngine::newBigFolder);
connect(_discoveryPhase.data(), &DiscoveryPhase::fatalError, this, [this](const QString &errorString) {
syncError(errorString);
finalize(false);
});
connect(_discoveryPhase.data(), &DiscoveryPhase::finished, this, &SyncEngine::slotDiscoveryJobFinished);
_discoveryJob = new ProcessDirectoryJob(SyncFileItemPtr(), ProcessDirectoryJob::NormalQuery, ProcessDirectoryJob::NormalQuery,
_discoveryPhase.data(), this);
// FIXME! this sucks
auto runQueuedJob = [this](ProcessDirectoryJob *job, const auto &runQueuedJob) -> void {
connect(job, &ProcessDirectoryJob::finished, this, [this, job, runQueuedJob] {
if (job->_dirItem)
job->itemDiscovered(job->_dirItem);
sender()->deleteLater();
if (!_discoveryPhase->_queuedDeletedDirectories.isEmpty()) {
auto job = qobject_cast<ProcessDirectoryJob *>(_discoveryPhase->_queuedDeletedDirectories.take(_discoveryPhase->_queuedDeletedDirectories.firstKey()).data());
ASSERT(job);
runQueuedJob(job, runQueuedJob);
} else {
slotDiscoveryJobFinished();
}
});
connect(job, &ProcessDirectoryJob::itemDiscovered, this, &SyncEngine::slotItemDiscovered);
job->start();
};
runQueuedJob(_discoveryJob.data(), runQueuedJob);
auto discoveryJob = new ProcessDirectoryJob(SyncFileItemPtr(), ProcessDirectoryJob::NormalQuery, ProcessDirectoryJob::NormalQuery,
_discoveryPhase.data(), _discoveryPhase.data());
_discoveryPhase->startJob(discoveryJob);
/*
* FIXME
@ -997,8 +981,9 @@ void SyncEngine::abort()
qCInfo(lcEngine) << "Aborting sync";
// Aborts the discovery phase job
if (_discoveryJob) {
_discoveryJob->abort();
if (_discoveryPhase) {
// Should take care to delete all children jobs
_discoveryPhase.take()->deleteLater();
}
// For the propagator
if (_propagator) {

1
src/libsync/syncengine.h
View file

@ -228,7 +228,6 @@ private:
QString _remotePath;
QString _remoteRootEtag;
SyncJournalDb *_journal;
QPointer<ProcessDirectoryJob> _discoveryJob;
QScopedPointer<DiscoveryPhase> _discoveryPhase;
QSharedPointer<OwncloudPropagator> _propagator;