3 files changed, 99 insertions, 32 deletions

diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 24fd426..3ad80f9 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -211,14 +211,49 @@ public:
         SinkLog() << "Removed " << count << " mails in " << path << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
     }
 
+    KAsync::Job<void> synchronizeFolder(QSharedPointer<ImapServerProxy> imap, const Imap::Folder &folder)
+    {
+        QSet<qint64> uids;
+        SinkLog() << "Synchronizing mails" << folder.normalizedPath();
+        auto capabilities = imap->getCapabilities();
+        bool canDoIncrementalRemovals = false;
+        return KAsync::start<void>([=]() {
+            //TODO update flags
+        })
+        .then<void, KAsync::Job<void>>([=]() {
+            //TODO Remove what's no longer existing
+            if (canDoIncrementalRemovals) {
+            } else {
+                return imap->fetchUids(folder).then<void, QVector<qint64>>([this, folder](const QVector<qint64> &uids) {
+                    SinkTrace() << "Syncing removals";
+                    synchronizeRemovals(folder.normalizedPath(), uids.toList().toSet());
+                    commit();
+                }).then<void>([](){});
+            }
+            return KAsync::null<void>();
+        })
+        .then<void, KAsync::Job<void>>([this, folder, imap]() {
+            auto uidNext = 0;
+            return imap->fetchMessages(folder, uidNext, [this, folder](const QVector<Message> &messages) {
+                SinkTrace() << "Got mail";
+                synchronizeMails(folder.normalizedPath(), messages);
+            },
+            [](int progress, int total) {
+                SinkTrace() << "Progress: " << progress << " out of " << total;
+            });
+        });
+
+
+    }
+
     KAsync::Job<void> synchronizeWithSource() Q_DECL_OVERRIDE
     {
         SinkLog() << " Synchronizing";
         return KAsync::start<void>([this](KAsync::Future<void> future) {
             SinkTrace() << "Connecting to:" << mServer << mPort;
             SinkTrace() << "as:" << mUser;
-            ImapServerProxy imap(mServer, mPort);
-            auto loginFuture = imap.login(mUser, mPassword).exec();
+            auto imap = QSharedPointer<ImapServerProxy>::create(mServer, mPort);
+            auto loginFuture = imap->login(mUser, mPassword).exec();
             loginFuture.waitForFinished();
             if (loginFuture.errorCode()) {
                 SinkWarning() << "Login failed.";
@@ -229,7 +264,7 @@ public:
             }
 
             QVector<Folder> folderList;
-            auto folderFuture = imap.fetchFolders([this, &imap, &folderList](const QVector<Folder> &folders) {
+            auto folderFuture = imap->fetchFolders([this, &imap, &folderList](const QVector<Folder> &folders) {
                 synchronizeFolders(folders);
                 commit();
                 folderList << folders;
@@ -248,27 +283,7 @@ public:
                 if (folder.noselect) {
                     continue;
                 }
-                QSet<qint64> uids;
-                SinkLog() << "Synchronizing mails" << folder.normalizedPath();
-                auto messagesFuture = imap.fetchMessages(folder, [this, folder, &uids](const QVector<Message> &messages) {
-                    for (const auto &msg : messages) {
-                        uids << msg.uid;
-                    }
-                    synchronizeMails(folder.normalizedPath(), messages);
-                },
-                [](int progress, int total) {
-                    SinkTrace() << "Progress: " << progress << " out of " << total;
-                }).exec();
-                messagesFuture.waitForFinished();
-                commit();
-                if (messagesFuture.errorCode()) {
-                    SinkWarning() << "Folder sync failed: " << folder.normalizedPath();
-                    continue;
-                }
-                //Remove what there is to remove
-                synchronizeRemovals(folder.normalizedPath(), uids);
-                commit();
-                SinkTrace() << "Folder synchronized: " << folder.normalizedPath();
+                synchronizeFolder(imap, folder).exec().waitForFinished();
             }
             future.setFinished();
         });
@@ -541,7 +556,7 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
         SinkTrace() << "Connecting to:" << mServer << mPort;
         SinkTrace() << "as:" << mUser;
         auto inspectionJob = imap->login(mUser, mPassword)
-            .then<void>(imap->select(folderRemoteId))
+            .then<void>(imap->select(folderRemoteId).then<void>([](){}))
             .then<void>(imap->fetch(set, scope, [imap, messageByUid](const QVector<Imap::Message> &messages) {
                 for (const auto &m : messages) {
                     messageByUid->insert(m.uid, m);
@@ -604,7 +619,7 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
             auto imap = QSharedPointer<ImapServerProxy>::create(mServer, mPort);
             auto messageByUid = QSharedPointer<QHash<qint64, Imap::Message>>::create();
             auto inspectionJob = imap->login(mUser, mPassword)
-                .then<void>(imap->select(remoteId))
+                .then<void>(imap->select(remoteId).then<void>([](){}))
                 .then<void>(imap->fetch(set, scope, [=](const QVector<Imap::Message> &messages) {
                     for (const auto &m : messages) {
                         messageByUid->insert(m.uid, m);
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index 3406315..5fffb36 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -33,6 +33,7 @@
 #include <KIMAP/KIMAP/StoreJob>
 #include <KIMAP/KIMAP/ExpungeJob>
 #include <KIMAP/KIMAP/CapabilitiesJob>
+#include <KIMAP/KIMAP/SearchJob>
 
 #include <KIMAP/KIMAP/SessionUiProxy>
 #include <KCoreAddons/KJob>
@@ -188,12 +189,14 @@ KAsync::Job<void> ImapServerProxy::login(const QString &username, const QString
     });
 }
 
-KAsync::Job<void> ImapServerProxy::select(const QString &mailbox)
+KAsync::Job<SelectResult> ImapServerProxy::select(const QString &mailbox)
 {
     auto select = new KIMAP::SelectJob(mSession);
     select->setMailBox(mailbox);
-    // select->setCondstoreEnabled(serverSupportsCondstore());
-    return runJob(select);
+    select->setCondstoreEnabled(mCapabilities.contains("CONDSTORE"));
+    return runJob<SelectResult>(select, [select](KJob* job) -> SelectResult {
+        return {select->uidValidity(), select->nextUid(), select->highestModSequence()};
+    });
 }
 
 KAsync::Job<qint64> ImapServerProxy::append(const QString &mailbox, const QByteArray &content, const QList<QByteArray> &flags, const QDateTime &internalDate)
@@ -303,6 +306,16 @@ KAsync::Job<void> ImapServerProxy::fetch(const KIMAP::ImapSet &set, KIMAP::Fetch
     return runJob(fetch);
 }
 
+KAsync::Job<QVector<qint64>> ImapServerProxy::search(const KIMAP::ImapSet &set)
+{
+    auto search = new KIMAP::SearchJob(mSession);
+    search->setTerm(KIMAP::Term(KIMAP::Term::Uid, set));
+    search->setUidBased(true);
+    return runJob<QVector<qint64>>(search, [](KJob *job) -> QVector<qint64> {
+        return static_cast<KIMAP::SearchJob*>(job)->results();
+    });
+}
+
 KAsync::Job<void> ImapServerProxy::fetch(const KIMAP::ImapSet &set, KIMAP::FetchJob::FetchScope scope, const std::function<void(const QVector<Message> &)> &callback)
 {
     return fetch(set, scope,
@@ -320,6 +333,11 @@ KAsync::Job<void> ImapServerProxy::fetch(const KIMAP::ImapSet &set, KIMAP::Fetch
                     });
 }
 
+QStringList ImapServerProxy::getCapabilities() const
+{
+    return mCapabilities;
+}
+
 KAsync::Job<QList<qint64>> ImapServerProxy::fetchHeaders(const QString &mailbox)
 {
     auto list = QSharedPointer<QList<qint64>>::create();
@@ -351,6 +369,11 @@ KAsync::Job<QList<qint64>> ImapServerProxy::fetchHeaders(const QString &mailbox)
     });
 }
 
+KAsync::Job<QVector<qint64>> ImapServerProxy::fetchUids(const QString &mailbox)
+{
+    return select(mailbox).then<QVector<qint64>>(search(KIMAP::ImapSet(1, 0)));
+}
+
 KAsync::Job<void> ImapServerProxy::list(KIMAP::ListJob::Option option, const std::function<void(const QList<KIMAP::MailBoxDescriptor> &mailboxes,const QList<QList<QByteArray> > &flags)> &callback)
 {
     auto listJob = new KIMAP::ListJob(mSession);
@@ -434,12 +457,19 @@ 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, std::function<void(int, int)> progress)
+KAsync::Job<void> ImapServerProxy::fetchMessages(const Folder &folder, qint64 uidNext, std::function<void(const QVector<Message> &)> callback, std::function<void(int, int)> progress)
 {
+    Q_UNUSED(uidNext);
     auto time = QSharedPointer<QTime>::create();
     time->start();
     Q_ASSERT(!mPersonalNamespaceSeparator.isNull());
-    return select(mailboxFromFolder(folder)).then<void, KAsync::Job<void>>([this, callback, folder, time, progress]() -> KAsync::Job<void> {
+    return select(mailboxFromFolder(folder)).then<void, KAsync::Job<void>, SelectResult>([this, callback, folder, time, progress, uidNext](const SelectResult &selectResult) -> KAsync::Job<void> {
+
+        if (selectResult.uidNext == uidNext) {
+            SinkTrace() << "Uidnext didn't change, nothing to do.";
+            return KAsync::null<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();
@@ -472,3 +502,13 @@ KAsync::Job<void> ImapServerProxy::fetchMessages(const Folder &folder, std::func
 
     });
 }
+
+KAsync::Job<void> ImapServerProxy::fetchMessages(const Folder &folder, std::function<void(const QVector<Message> &)> callback, std::function<void(int, int)> progress)
+{
+    return fetchMessages(folder, 0, callback, progress);
+}
+
+KAsync::Job<QVector<qint64>> ImapServerProxy::fetchUids(const Folder &folder)
+{
+    return fetchUids(mailboxFromFolder(folder));
+}
diff --git a/examples/imapresource/imapserverproxy.h b/examples/imapresource/imapserverproxy.h
index f3e1794..9baa52c 100644
--- a/examples/imapresource/imapserverproxy.h
+++ b/examples/imapresource/imapserverproxy.h
@@ -75,6 +75,12 @@ struct Folder {
     bool noselect;
 };
 
+struct SelectResult {
+    qint64 uidValidity;
+    qint64 uidNext;
+    quint64 highestModSequence;
+};
+
 class ImapServerProxy {
     KIMAP::Session *mSession;
     QStringList mCapabilities;
@@ -91,7 +97,7 @@ public:
 
     //Standard IMAP calls
     KAsync::Job<void> login(const QString &username, const QString &password);
-    KAsync::Job<void> select(const QString &mailbox);
+    KAsync::Job<SelectResult> select(const QString &mailbox);
     KAsync::Job<qint64> append(const QString &mailbox, const QByteArray &content, const QList<QByteArray> &flags = QList<QByteArray>(), const QDateTime &internalDate = QDateTime());
     KAsync::Job<void> store(const KIMAP::ImapSet &set, const QList<QByteArray> &flags);
     KAsync::Job<void> storeFlags(const KIMAP::ImapSet &set, const QList<QByteArray> &flags);
@@ -103,6 +109,7 @@ public:
     KAsync::Job<void> expunge();
     KAsync::Job<void> expunge(const KIMAP::ImapSet &set);
     KAsync::Job<void> copy(const KIMAP::ImapSet &set, const QString &newMailbox);
+    KAsync::Job<QVector<qint64>> search(const KIMAP::ImapSet &set);
 
     typedef std::function<void(const QString &,
                         const QMap<qint64,qint64> &,
@@ -115,6 +122,8 @@ public:
     KAsync::Job<void> fetch(const KIMAP::ImapSet &set, KIMAP::FetchJob::FetchScope scope, const std::function<void(const QVector<Message> &)> &callback);
     KAsync::Job<void> list(KIMAP::ListJob::Option option, const std::function<void(const QList<KIMAP::MailBoxDescriptor> &mailboxes,const QList<QList<QByteArray> > &flags)> &callback);
 
+    QStringList getCapabilities() const;
+
     //Composed calls that do login etc.
     KAsync::Job<QList<qint64>> fetchHeaders(const QString &mailbox);
     KAsync::Job<void> remove(const QString &mailbox, const KIMAP::ImapSet &set);
@@ -122,11 +131,14 @@ public:
     KAsync::Job<void> move(const QString &mailbox, const KIMAP::ImapSet &set, const QString &newMailbox);
     KAsync::Job<QString> createSubfolder(const QString &parentMailbox, const QString &folderName);
     KAsync::Job<QString> renameSubfolder(const QString &mailbox, const QString &newName);
+    KAsync::Job<QVector<qint64>> fetchUids(const QString &mailbox);
 
     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, std::function<void(int, int)> progress = std::function<void(int, int)>());
+    KAsync::Job<void> fetchMessages(const Folder &folder, qint64 uidNext, std::function<void(const QVector<Message> &)> callback, std::function<void(int, int)> progress = std::function<void(int, int)>());
+    KAsync::Job<QVector<qint64>> fetchUids(const Folder &folder);
 
 private:
     KAsync::Job<void> ping();