From 8a0a4de6c51d5ef23ae86655a63536bd8386c575 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 29 Aug 2016 09:36:36 +0200
Subject: Made use of KAsync::Job::serialEach

---
 examples/imapresource/imapresource.cpp | 56 +++++++++++++++-------------------
 1 file changed, 25 insertions(+), 31 deletions(-)

(limited to 'examples/imapresource')

diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index da87bdb..aad7887 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -261,43 +261,37 @@ public:
     KAsync::Job<void> synchronizeWithSource() Q_DECL_OVERRIDE
     {
         SinkLog() << " Synchronizing";
-        return KAsync::start<void>([this](KAsync::Future<void> future) {
+        return KAsync::start<void>([this]() {
             SinkTrace() << "Connecting to:" << mServer << mPort;
             SinkTrace() << "as:" << mUser;
             auto imap = QSharedPointer<ImapServerProxy>::create(mServer, mPort);
-            auto loginFuture = imap->login(mUser, mPassword).exec();
-            loginFuture.waitForFinished();
-            if (loginFuture.errorCode()) {
-                SinkWarning() << "Login failed.";
-                future.setError(1, "Login failed");
-                return;
-            } else {
-                SinkTrace() << "Login was successful";
-            }
 
-            QVector<Folder> folderList;
-            auto folderFuture = imap->fetchFolders([this, &imap, &folderList](const QVector<Folder> &folders) {
-                synchronizeFolders(folders);
-                commit();
-                folderList << folders;
-
-            }).exec();
-            folderFuture.waitForFinished();
-            if (folderFuture.errorCode()) {
-                SinkWarning() << "Folder sync failed.";
-                future.setError(1, "Folder list sync failed");
-                return;
-            } else {
-                SinkTrace() << "Folder sync was successful";
-            }
-
-            for (const auto &folder : folderList) {
+            return imap->login(mUser, mPassword)
+            .addToContext(imap)
+            .onError([](const KAsync::Error &error) {
+                SinkWarning() << "Login failed.";
+            })
+            .then<QVector<Folder>>([this, imap]() {
+                auto folderList = QSharedPointer<QVector<Folder>>::create();
+                SinkLog() << "Login was successful";
+                return  imap->fetchFolders([this, &imap, folderList](const QVector<Folder> &folders) {
+                    synchronizeFolders(folders);
+                    commit();
+                    *folderList << folders;
+                })
+                .onError([](const KAsync::Error &error) {
+                    SinkWarning() << "Folder list sync failed.";
+                })
+                .syncThen<QVector<Folder>>([folderList]() {
+                    return *folderList;
+                });
+            })
+            .serialEach<void>([this, imap](const Folder &folder) {
                 if (folder.noselect) {
-                    continue;
+                    return KAsync::null<void>();
                 }
-                synchronizeFolder(imap, folder).exec().waitForFinished();
-            }
-            future.setFinished();
+                return synchronizeFolder(imap, folder);
+            });
         });
     }
 
-- 
cgit v1.2.3