refactor(discovery): extract updateDirItemFromServerJob

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>

Author: solracsf

src/libsync/discovery.cpp

@@ -2259,6 +2259,29 @@ void ProcessDirectoryJob::chopVirtualFileSuffix(QString &str) const
     }
 }
 
+void ProcessDirectoryJob::updateDirItemFromServerJob(DiscoverySingleDirectoryJob *serverJob)
+{
+    if (_dirItem->isEncrypted()) {
+        _dirItem->_isFileDropDetected = serverJob->isFileDropDetected();
+
+        SyncJournalFileRecord record;
+        const auto alreadyDownloaded = _discoveryData->_statedb->getFileRecord(_dirItem->_file, &record) && record.isValid();
+        // we need to make sure we first download all e2ee files/folders before migrating
+        _dirItem->_isEncryptedMetadataNeedUpdate = alreadyDownloaded && serverJob->encryptedMetadataNeedUpdate();
+        _dirItem->_e2eEncryptionStatus = serverJob->currentEncryptionStatus();
+        _dirItem->_e2eEncryptionStatusRemote = serverJob->currentEncryptionStatus();
+        _dirItem->_e2eEncryptionServerCapability = serverJob->requiredEncryptionStatus();
+        qCDebug(lcDisco()) << _dirItem->_e2eEncryptionStatus << _dirItem->_e2eEncryptionServerCapability;
+        Q_ASSERT(_dirItem->_e2eEncryptionStatus != SyncFileItem::EncryptionStatus::Encrypted);
+        Q_ASSERT(_dirItem->_e2eEncryptionStatus != SyncFileItem::EncryptionStatus::NotEncrypted);
+        _discoveryData->_anotherSyncNeeded = !alreadyDownloaded && serverJob->encryptedMetadataNeedUpdate();
+    }
+    qCDebug(lcDisco) << "serverJob has finished for folder:" << _dirItem->_file
+                     << "and it has _isFileDropDetected:" << _dirItem->_isFileDropDetected
+                     << "with quota bytesUsed:" << _dirItem->_folderQuota.bytesUsed
+                     << "bytesAvailable:" << _dirItem->_folderQuota.bytesAvailable;
+}
+
 DiscoverySingleDirectoryJob *ProcessDirectoryJob::startAsyncServerQuery()
 {
     if (_dirItem && _dirItem->isEncrypted() && _dirItem->_encryptedFileName.isEmpty()) {
@@ -2281,24 +2304,7 @@ DiscoverySingleDirectoryJob *ProcessDirectoryJob::startAsyncServerQuery()
     _pendingAsyncJobs++;
     connect(serverJob, &DiscoverySingleDirectoryJob::finished, this, [this, serverJob](const auto &results) {
         if (_dirItem) {
-            if (_dirItem->isEncrypted()) {
-                _dirItem->_isFileDropDetected = serverJob->isFileDropDetected();
-
-                SyncJournalFileRecord record;
-                const auto alreadyDownloaded = _discoveryData->_statedb->getFileRecord(_dirItem->_file, &record) && record.isValid();
-                // we need to make sure we first download all e2ee files/folders before migrating
-                _dirItem->_isEncryptedMetadataNeedUpdate = alreadyDownloaded && serverJob->encryptedMetadataNeedUpdate();
-                _dirItem->_e2eEncryptionStatus = serverJob->currentEncryptionStatus();
-                _dirItem->_e2eEncryptionStatusRemote = serverJob->currentEncryptionStatus();
-                _dirItem->_e2eEncryptionServerCapability = serverJob->requiredEncryptionStatus();
-                qCDebug(lcDisco()) << _dirItem->_e2eEncryptionStatus << _dirItem->_e2eEncryptionServerCapability;
-                Q_ASSERT(_dirItem->_e2eEncryptionStatus != SyncFileItem::EncryptionStatus::Encrypted);
-                Q_ASSERT(_dirItem->_e2eEncryptionStatus != SyncFileItem::EncryptionStatus::NotEncrypted);
-                _discoveryData->_anotherSyncNeeded = !alreadyDownloaded && serverJob->encryptedMetadataNeedUpdate();
-            }
-            qCDebug(lcDisco) << "serverJob has finished for folder:" << _dirItem->_file << " and it has _isFileDropDetected:" << _dirItem->_isFileDropDetected
-                             << "with quota bytesUsed:" << _dirItem->_folderQuota.bytesUsed
-                             << "bytesAvailable:" << _dirItem->_folderQuota.bytesAvailable;
+            updateDirItemFromServerJob(serverJob);
         }
         _discoveryData->_currentlyActiveJobs--;
         _pendingAsyncJobs--;

src/libsync/discovery.h

@@ -204,6 +204,7 @@ class ProcessDirectoryJob : public QObject
      */
     MovePermissionResult checkMovePermissions(RemotePermissions srcPerm, const QString &srcPath, bool isDirectory);
 
+    void updateDirItemFromServerJob(DiscoverySingleDirectoryJob *serverJob);
     void processBlacklisted(const PathTuple &, const LocalInfo &, const SyncJournalFileRecord &dbEntry);
     void subJobFinished();