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

New discovery algo: data finger print

Browse Source
This commit is contained in:
Olivier Goffart 2018-08-21 19:54:48 +02:00 committed by Kevin Ottens
parent 5683f1c33d
commit 3a06a7978f
No known key found for this signature in database
GPG Key ID: 074BBBCB8DECC9E2
3 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsync/discovery.cpp
View File

@ -37,10 +37,12 @@ void ProcessDirectoryJob::start()
if (_queryServer == NormalQuery) {
serverJob = new DiscoverySingleDirectoryJob(_discoveryData->_account,
_discoveryData->_remoteFolder + _currentFolder._server, this);
connect(serverJob, &DiscoverySingleDirectoryJob::finished, this, [this](const auto &results) {
connect(serverJob, &DiscoverySingleDirectoryJob::finished, this, [this, serverJob](const auto &results) {
if (results) {
_serverEntries = *results;
_hasServerEntries = true;
if (!serverJob->_dataFingerprint.isEmpty() && _discoveryData->_dataFingerprint.isEmpty())
_discoveryData->_dataFingerprint = serverJob->_dataFingerprint;
if (_hasLocalEntries)
process();
} else {

2
src/libsync/discoveryphase.h
View File

@ -147,6 +147,8 @@ public:
void startJob(ProcessDirectoryJob *);
QByteArray _dataFingerprint;
signals:
void fatalError(const QString &errorString);
void itemDiscovered(const SyncFileItemPtr &item);

32
src/libsync/syncengine.cpp
View File

@ -705,28 +705,15 @@ void SyncEngine::slotDiscoveryJobFinished()
}
}
/*
auto databaseFingerprint = _journal->dataFingerprint();
// 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)
if (!databaseFingerprint.isEmpty()
&& _discoveryMainThread->_dataFingerprint != databaseFingerprint) {
qCInfo(lcEngine) << "data fingerprint changed, assume restore from backup" << databaseFingerprint << _discoveryMainThread->_dataFingerprint;
restoreOldFiles(syncItems);
} else if (!_hasForwardInTimeFiles && _backInTimeFiles >= 2
&& _account->serverVersionInt() < Account::makeServerVersion(9, 1, 0)) {
// The server before ownCloud 9.1 did not have the data-fingerprint property. So in that
// case we use heuristics to detect restored backup. This is disabled with newer version
// because this causes troubles to the user and is not as reliable as the data-fingerprint.
qCInfo(lcEngine) << "All the changes are bringing files in the past, asking the user";
// this typically happen when a backup is restored on the server
bool restore = false;
emit aboutToRestoreBackup(&restore);
if (restore) {
restoreOldFiles(syncItems);
}
if (!databaseFingerprint.isEmpty() && _discoveryPhase
&& _discoveryPhase->_dataFingerprint != databaseFingerprint) {
qCInfo(lcEngine) << "data fingerprint changed, assume restore from backup" << databaseFingerprint << _discoveryPhase->_dataFingerprint;
restoreOldFiles(_syncItems);
}
*/
// Sort items per destination
std::sort(_syncItems.begin(), _syncItems.end());
@ -830,16 +817,13 @@ void SyncEngine::slotFinished(bool success)
_anotherSyncNeeded = ImmediateFollowUp;
}
#if 0
FIXME
if (success) {
_journal->setDataFingerprint(_discoveryMainThread->_dataFingerprint);
if (success && _discoveryPhase) {
_journal->setDataFingerprint(_discoveryPhase->_dataFingerprint);
}
if (!_journal->postSyncCleanup(_seenFiles, _temporarilyUnavailablePaths)) {
if (success && !_journal->postSyncCleanup(_seenFiles, _temporarilyUnavailablePaths)) {
qCDebug(lcEngine) << "Cleaning of synced ";
}
#endif
conflictRecordMaintenance();