Progress reporting

3 files changed, 26 insertions, 7 deletions

diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index dde218a..24fd426 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -255,6 +255,9 @@ public:
                         uids << msg.uid;
                     }
                     synchronizeMails(folder.normalizedPath(), messages);
+                },
+                [](int progress, int total) {
+                    SinkTrace() << "Progress: " << progress << " out of " << total;
                 }).exec();
                 messagesFuture.waitForFinished();
                 commit();
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index b1ba5e7..3406315 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -325,7 +325,7 @@ KAsync::Job<QList<qint64>> ImapServerProxy::fetchHeaders(const QString &mailbox)
     auto list = QSharedPointer<QList<qint64>>::create();
     KIMAP::FetchJob::FetchScope scope;
     scope.parts.clear();
-    scope.mode = KIMAP::FetchJob::FetchScope::Headers;
+    scope.mode = KIMAP::FetchJob::FetchScope::Flags;
 
     //Fetch headers of all messages
     return fetch(KIMAP::ImapSet(1, 0), scope,
@@ -434,12 +434,21 @@ QString ImapServerProxy::mailboxFromFolder(const Folder &folder) const
     return folder.pathParts.join(mPersonalNamespaceSeparator);
 }
 
-KAsync::Job<void> ImapServerProxy::fetchMessages(const Folder &folder, std::function<void(const QVector<Message> &)> callback)
+KAsync::Job<void> ImapServerProxy::fetchMessages(const Folder &folder, std::function<void(const QVector<Message> &)> callback, std::function<void(int, int)> progress)
 {
+    auto time = QSharedPointer<QTime>::create();
+    time->start();
     Q_ASSERT(!mPersonalNamespaceSeparator.isNull());
-    return select(mailboxFromFolder(folder)).then<void, KAsync::Job<void>>([this, callback, folder]() -> KAsync::Job<void> {
-        return fetchHeaders(mailboxFromFolder(folder)).then<void, KAsync::Job<void>, QList<qint64>>([this, callback](const QList<qint64> &uidsToFetch){
-            SinkTrace() << "Uids to fetch: " << uidsToFetch;
+    return select(mailboxFromFolder(folder)).then<void, KAsync::Job<void>>([this, callback, folder, time, progress]() -> KAsync::Job<void> {
+        return fetchHeaders(mailboxFromFolder(folder)).then<void, KAsync::Job<void>, QList<qint64>>([this, callback, time, progress](const QList<qint64> &uidsToFetch){
+            SinkTrace() << "Fetched headers";
+            SinkTrace() << "  Total: " << uidsToFetch.size();
+            SinkTrace() << "  Uids to fetch: " << uidsToFetch;
+            SinkTrace() << "  Took: " << Sink::Log::TraceTime(time->elapsed());
+            auto totalCount = uidsToFetch.size();
+            if (progress) {
+                progress(0, totalCount);
+            }
             if (uidsToFetch.isEmpty()) {
                 SinkTrace() << "Nothing to fetch";
                 callback(QVector<Message>());
@@ -451,7 +460,14 @@ KAsync::Job<void> ImapServerProxy::fetchMessages(const Folder &folder, std::func
 
             KIMAP::ImapSet set;
             set.add(uidsToFetch.toVector());
-            return fetch(set, scope, callback);
+            auto count = QSharedPointer<int>::create();
+            return fetch(set, scope, [=](const QVector<Message> &messages) {
+                *count += messages.size();
+                if (progress) {
+                    progress(*count, totalCount);
+                }
+                callback(messages);
+            });
         });
 
     });
diff --git a/examples/imapresource/imapserverproxy.h b/examples/imapresource/imapserverproxy.h
index b54b41e..f3e1794 100644
--- a/examples/imapresource/imapserverproxy.h
+++ b/examples/imapresource/imapserverproxy.h
@@ -126,7 +126,7 @@ public:
     QString mailboxFromFolder(const Folder &) const;
 
     KAsync::Job<void> fetchFolders(std::function<void(const QVector<Folder> &)> callback);
-    KAsync::Job<void> fetchMessages(const Folder &folder, std::function<void(const QVector<Message> &)> callback);
+    KAsync::Job<void> fetchMessages(const Folder &folder, std::function<void(const QVector<Message> &)> callback, std::function<void(int, int)> progress = std::function<void(int, int)>());
 
 private:
     KAsync::Job<void> ping();