Fixed shutdown and synchronize commands

4 files changed, 28 insertions, 12 deletions

diff --git a/common/clientapi.cpp b/common/clientapi.cpp
index aa3abb4..f99ebb8 100644
--- a/common/clientapi.cpp
+++ b/common/clientapi.cpp
@@ -69,10 +69,10 @@ QList<QByteArray> Store::getResources(const QList<QByteArray> &resourceFilter, c
     return resources;
 }
 
-void Store::shutdown(const QByteArray &identifier)
+KAsync::Job<void> Store::shutdown(const QByteArray &identifier)
 {
     Trace() << "shutdown";
-    ResourceAccess::connectToServer(identifier).then<void, QSharedPointer<QLocalSocket>>([identifier](const QSharedPointer<QLocalSocket> &socket, KAsync::Future<void> &future) {
+    return ResourceAccess::connectToServer(identifier).then<void, QSharedPointer<QLocalSocket>>([identifier](QSharedPointer<QLocalSocket> socket, KAsync::Future<void> &future) {
         //We can't currently reuse the socket
         socket->close();
         auto resourceAccess = QSharedPointer<Akonadi2::ResourceAccess>::create(identifier);
@@ -83,15 +83,24 @@ void Store::shutdown(const QByteArray &identifier)
     },
     [](int, const QString &) {
         //Resource isn't started, nothing to shutdown
-    }).exec().waitForFinished();
+    })
+    //FIXME JOBAPI this is only required because we don't care about the return value of connectToServer
+    .template then<void>([](){});
 }
 
-void Store::synchronize(const QByteArray &identifier)
+KAsync::Job<void> Store::synchronize(const Akonadi2::Query &query)
 {
     Trace() << "synchronize";
-    auto resourceAccess = QSharedPointer<Akonadi2::ResourceAccess>::create(identifier);
-    resourceAccess->open();
-    resourceAccess->synchronizeResource(true, false).exec().waitForFinished();
+    return  KAsync::iterate(query.resources)
+    .template each<void, QByteArray>([query](const QByteArray &resource, KAsync::Future<void> &future) {
+        auto resourceAccess = QSharedPointer<Akonadi2::ResourceAccess>::create(resource);
+        resourceAccess->open();
+        resourceAccess->synchronizeResource(true, false).then<void>([&future]() {
+            future.setFinished();
+        }).exec();
+    })
+    //FIXME JOBAPI this is only required because we don't care about the return value of each (and each shouldn't even have a return value)
+    .template then<void>([](){});
 }
 
 } // namespace Akonadi2
diff --git a/common/clientapi.h b/common/clientapi.h
index 4e6db09..9a32188 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -153,10 +153,15 @@ public:
         });
     }
 
-    static void shutdown(const QByteArray &resourceIdentifier);
+    /**
+     * Shutdown resource.
+     */
+    static KAsync::Job<void> shutdown(const QByteArray &resourceIdentifier);
 
-    //TODO do we really want this command? And if yes, shouldn't it take a query to specify what to sync exactly?
-    static void synchronize(const QByteArray &resourceIdentifier);
+    /**
+     * Synchronize data to local cache.
+     */
+    static KAsync::Job<void> synchronize(const Akonadi2::Query &query);
 };
 
 
diff --git a/examples/client/main.cpp b/examples/client/main.cpp
index 52f3607..0a1a725 100644
--- a/examples/client/main.cpp
+++ b/examples/client/main.cpp
@@ -59,7 +59,9 @@ public:
         auto syncButton = new QPushButton(this);
         syncButton->setText("Synchronize!");
         QObject::connect(syncButton, &QPushButton::pressed, []() {
-            Akonadi2::Store::synchronize("org.kde.dummy.instance1");
+            Akonadi2::Query query;
+            query.resources << "org.kde.dummy.instance1";
+            Akonadi2::Store::synchronize(query);
         });
 
         auto removeButton = new QPushButton(this);
diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index ae71912..d027266 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -31,7 +31,7 @@ private Q_SLOTS:
 
     void cleanup()
     {
-        Akonadi2::Store::shutdown("org.kde.dummy.instance1");
+        Akonadi2::Store::shutdown(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
         DummyResource::removeFromDisk("org.kde.dummy.instance1");
         auto factory = Akonadi2::ResourceFactory::load("org.kde.dummy");
         QVERIFY(factory);