From ca136dfcaaa83648d59a6f04bb86dec6d143e86b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Thu, 22 Mar 2018 17:52:59 +0000
Subject: [PATCH] Add some comments.

Move copyblocks function lower in a file.
---
 src/backend/corebackendmanager.cpp |  2 +
 src/util/externalcommand.cpp       | 86 ++++++++++++++++--------------
 2 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/src/backend/corebackendmanager.cpp b/src/backend/corebackendmanager.cpp
index 04cc7b2..5b6c00c 100644
--- a/src/backend/corebackendmanager.cpp
+++ b/src/backend/corebackendmanager.cpp
@@ -71,6 +71,8 @@ void CoreBackendManager::startExternalCommandHelper()
     action.setArguments(arguments);
     m_job = action.execute();
     job()->start();
+
+    // Wait until ExternalCommand Helper is ready (helper sends newData signal just before it enters event loop)
     QEventLoop loop;
     auto exitLoop = [&] () {loop.exit();};
     auto conn = QObject::connect(job(), &KAuth::ExecuteJob::newData, exitLoop);
diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp
index 8cfe5b3..9f7cd74 100644
--- a/src/util/externalcommand.cpp
+++ b/src/util/externalcommand.cpp
@@ -39,46 +39,6 @@
 #include <KAuth>
 #include <KLocalizedString>
 
-bool ExternalCommand::copyBlocks(CopySource& source, CopyTarget& target)
-{
-    bool rval = true;
-    const qint64 blockSize = 10 * 1024 * 1024; // number of bytes per block to copy
-
-    if (!QDBusConnection::systemBus().isConnected()) {
-        qWarning() << "Could not connect to DBus system bus";
-        return false;
-    }
-
-    // TODO KF6:Use new signal-slot syntax
-    connect(CoreBackendManager::self()->job(), SIGNAL(percent(KJob*, unsigned long)), this, SLOT(emitProgress(KJob*, unsigned long)));
-    connect(CoreBackendManager::self()->job(), &KAuth::ExecuteJob::newData, this, &ExternalCommand::emitReport);
-
-    QDBusInterface iface(QStringLiteral("org.kde.kpmcore.helperinterface"), QStringLiteral("/Helper"), QStringLiteral("org.kde.kpmcore.externalcommand"), QDBusConnection::systemBus());
-    iface.setTimeout(10 * 24 * 3600 * 1000); // 10 days
-    if (iface.isValid()) {
-        QDBusPendingCall pcall= iface.asyncCall(QStringLiteral("copyblocks"), CoreBackendManager::self()->Uuid(), source.path(), source.firstByte(), source.length(), target.path(), target.firstByte(), blockSize);
-        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
-        QEventLoop loop;
-
-        auto exitLoop = [&] (QDBusPendingCallWatcher *watcher) {
-            loop.exit();
-            if (watcher->isError()) {
-                qWarning() << watcher->error();
-            }
-            else {
-                QDBusPendingReply<bool> reply = *watcher;
-                rval = reply.argumentAt<0>();
-            }
-            setExitCode(!rval);
-        };
-
-        connect(watcher, &QDBusPendingCallWatcher::finished, exitLoop);
-        loop.exec();
-    }
-
-    return rval;
-}
-
 /** Creates a new ExternalCommand instance without Report.
     @param cmd the command to run
     @param args the arguments to pass to the command
@@ -179,6 +139,52 @@ bool ExternalCommand::start(int timeout)
     return rval;
 }
 
+bool ExternalCommand::copyBlocks(CopySource& source, CopyTarget& target)
+{
+    bool rval = true;
+    const qint64 blockSize = 10 * 1024 * 1024; // number of bytes per block to copy
+
+    if (!QDBusConnection::systemBus().isConnected()) {
+        qWarning() << "Could not connect to DBus system bus";
+        return false;
+    }
+
+    // TODO KF6:Use new signal-slot syntax
+    connect(CoreBackendManager::self()->job(), SIGNAL(percent(KJob*, unsigned long)), this, SLOT(emitProgress(KJob*, unsigned long)));
+    connect(CoreBackendManager::self()->job(), &KAuth::ExecuteJob::newData, this, &ExternalCommand::emitReport);
+
+    QDBusInterface iface(QStringLiteral("org.kde.kpmcore.helperinterface"), QStringLiteral("/Helper"), QStringLiteral("org.kde.kpmcore.externalcommand"), QDBusConnection::systemBus());
+    iface.setTimeout(10 * 24 * 3600 * 1000); // 10 days
+    if (iface.isValid()) {
+        // Use asynchronous DBus calls, so that we can process reports and progress
+        QDBusPendingCall pcall= iface.asyncCall(QStringLiteral("copyblocks"),
+                                                CoreBackendManager::self()->Uuid(),
+                                                source.path(), source.firstByte(), source.length(),
+                                                target.path(), target.firstByte(), blockSize);
+
+        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
+        QEventLoop loop;
+
+        auto exitLoop = [&] (QDBusPendingCallWatcher *watcher) {
+            loop.exit();
+            if (watcher->isError()) {
+                qWarning() << watcher->error();
+            }
+            else {
+                QDBusPendingReply<bool> reply = *watcher;
+                rval = reply.argumentAt<0>();
+            }
+            setExitCode(!rval);
+        };
+
+        connect(watcher, &QDBusPendingCallWatcher::finished, exitLoop);
+        loop.exec();
+    }
+
+    return rval;
+}
+
+
 bool ExternalCommand::write(const QByteArray& input)
 {
     m_Input = input;