tidy code to fix review comments

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp
index fe1b62ee89d31d67bd23014ea92cc2da86f5163a..e7cb6e9b7eeb57a43398a36a0275c1599b761325 100644 (file)
--- a/src/libsync/propagatorjobs.cpp
+++ b/src/libsync/propagatorjobs.cpp
@@ -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;
+}
 }

diff --git a/src/libsync/propagatorjobs.h b/src/libsync/propagatorjobs.h
index 3fa37ac03ce0c07b4b54584c3dd6fb534f902f9c..099286829398dfb14f8e758c51af6b6143d4b0d4 100644 (file)
--- a/src/libsync/propagatorjobs.h
+++ b/src/libsync/propagatorjobs.h
@@ -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);
+
 };
 }

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index b47845e9a8c3c9694b418e1f76cae461c020d3b1..283877fa1fafae898a8a168698c8550507474773 100644 (file)
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -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);