5 files changed, 58 insertions, 20 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 210774f..d5729da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0048 NEW)
 cmake_policy(SET CMP0028 NEW)
 
-project(sink VERSION 0.4.0)
+project(sink VERSION 0.5)
 
 option(BUILD_MAILDIR "BUILD_MAILDIR" ON)
 option(BUILD_DAV "BUILD_DAV" ON)
diff --git a/common/datastorequery.cpp b/common/datastorequery.cpp
index 4c95606..ad21910 100644
--- a/common/datastorequery.cpp
+++ b/common/datastorequery.cpp
@@ -524,6 +524,7 @@ void DataStoreQuery::setupQuery(const Sink::QueryBase &query_)
 {
     auto query = query_;
     auto baseFilters = query.getBaseFilters();
+    //Resolve any subqueries we have
     for (const auto &k : baseFilters.keys()) {
         const auto comparator = baseFilters.value(k);
         if (comparator.value.canConvert<Query>()) {
@@ -534,26 +535,26 @@ void DataStoreQuery::setupQuery(const Sink::QueryBase &query_)
     }
     query.setBaseFilters(baseFilters);
 
-    FilterBase::Ptr baseSet;
-    QSet<QByteArray> remainingFilters = query.getBaseFilters().keys().toSet();
     QByteArray appliedSorting;
-    if (!query.ids().isEmpty()) {
-        mSource = Source::Ptr::create(query.ids().toVector(), this);
-        baseSet = mSource;
-    } else {
-        QSet<QByteArray> appliedFilters;
-
-        auto resultSet = mStore.indexLookup(mType, query, appliedFilters, appliedSorting);
-        remainingFilters = remainingFilters - appliedFilters;
-
-        // We do a full scan if there were no indexes available to create the initial set.
-        if (appliedFilters.isEmpty()) {
-            mSource = Source::Ptr::create(mStore.fullScan(mType), this);
+
+    //Determine initial set
+    mSource = [&]() {
+        if (!query.ids().isEmpty()) {
+            //We have a set of ids as a starting point
+            return Source::Ptr::create(query.ids().toVector(), this);
         } else {
-            mSource = Source::Ptr::create(resultSet, this);
+            QSet<QByteArray> appliedFilters;
+            auto resultSet = mStore.indexLookup(mType, query, appliedFilters, appliedSorting);
+            if (!appliedFilters.isEmpty()) {
+                //We have an index lookup as starting point
+                return Source::Ptr::create(resultSet, this);
+            }
+            // We do a full scan if there were no indexes available to create the initial set (this is going to be expensive for large sets).
+            return Source::Ptr::create(mStore.fullScan(mType), this);
         }
-        baseSet = mSource;
-    }
+    }();
+
+    FilterBase::Ptr baseSet = mSource;
     if (!query.getBaseFilters().isEmpty()) {
         auto filter = Filter::Ptr::create(baseSet, this);
         //For incremental queries the remaining filters are not sufficient
diff --git a/common/mail/threadindexer.cpp b/common/mail/threadindexer.cpp
index 1401fc8..68f7af7 100644
--- a/common/mail/threadindexer.cpp
+++ b/common/mail/threadindexer.cpp
@@ -46,6 +46,11 @@ void ThreadIndexer::updateThreadingIndex(const QByteArray &identifier, const App
         if (!parentThread.isEmpty()) {
             auto childThreadId = thread.first();
             auto parentThreadId = parentThread.first();
+            //Can happen if the message is already available locally.
+            if (childThreadId == parentThreadId) {
+                //Nothing to do
+                return;
+            }
             SinkTrace() << "Merging child thread: " << childThreadId << " into parent thread: " << parentThreadId;
 
             //Ensure this mail ends up in the correct thread
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index 5c2e07c..16887b1 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -31,6 +31,7 @@
 #include <KIMAP2/ExpungeJob>
 #include <KIMAP2/CapabilitiesJob>
 #include <KIMAP2/SearchJob>
+#include <KIMAP2/GetMetaDataJob>
 
 #include <KCoreAddons/KJob>
 
@@ -479,14 +480,33 @@ static void reportFolder(const Folder &f, QSharedPointer<QSet<QString>> reported
     }
 }
 
+KAsync::Job<void> ImapServerProxy::getMetaData(std::function<void(const QHash<QString, QMap<QByteArray, QByteArray> > &metadata)> callback)
+{
+    if (!mCapabilities.contains("METADATA")) {
+        return KAsync::null();
+    }
+    KIMAP2::GetMetaDataJob *meta = new KIMAP2::GetMetaDataJob(mSession);
+    meta->setMailBox(QLatin1String("*"));
+    meta->setServerCapability( KIMAP2::MetaDataJobBase::Metadata );
+    meta->setDepth(KIMAP2::GetMetaDataJob::AllLevels);
+    meta->addRequestedEntry("/shared/vendor/kolab/folder-type");
+    meta->addRequestedEntry("/private/vendor/kolab/folder-type");
+    return runJob(meta).then<void>([callback, meta] () {
+        callback(meta->allMetaDataForMailboxes());
+    });
+}
+
 KAsync::Job<void> ImapServerProxy::fetchFolders(std::function<void(const Folder &)> callback)
 {
     SinkTrace() << "Fetching folders";
     auto subscribedList = QSharedPointer<QSet<QString>>::create() ;
     auto reportedList = QSharedPointer<QSet<QString>>::create() ;
-    return list(KIMAP2::ListJob::NoOption, [=](const KIMAP2::MailBoxDescriptor &mailbox, const QList<QByteArray> &){
+    auto metaData = QSharedPointer<QHash<QString, QMap<QByteArray, QByteArray>>>::create() ;
+    return getMetaData([=] (const QHash<QString, QMap<QByteArray, QByteArray>> &m) {
+        *metaData = m;
+    }).then(list(KIMAP2::ListJob::NoOption, [=](const KIMAP2::MailBoxDescriptor &mailbox, const QList<QByteArray> &){
         *subscribedList << mailbox.name;
-    }).then(list(KIMAP2::ListJob::IncludeUnsubscribed, [=](const KIMAP2::MailBoxDescriptor &mailbox, const QList<QByteArray> &flags) {
+    })).then(list(KIMAP2::ListJob::IncludeUnsubscribed, [=](const KIMAP2::MailBoxDescriptor &mailbox, const QList<QByteArray> &flags) {
         bool noselect = caseInsensitiveContains(FolderFlags::Noselect, flags);
         bool subscribed = subscribedList->contains(mailbox.name);
         if (isGmail()) {
@@ -502,6 +522,17 @@ KAsync::Job<void> ImapServerProxy::fetchFolders(std::function<void(const Folder
             }
         }
         SinkLog() << "Found mailbox: " << mailbox.name << flags << FolderFlags::Noselect << noselect  << " sub: " << subscribed;
+        //Ignore all non-mail folders
+        if (metaData->contains(mailbox.name)) {
+            auto m = metaData->value(mailbox.name);
+            auto sharedType = m.value("/shared/vendor/kolab/folder-type");
+            auto privateType = m.value("/private/vendor/kolab/folder-type");
+            auto type = !privateType.isEmpty() ? privateType : sharedType;
+            if (!type.isEmpty() && !type.contains("mail")) {
+                SinkLog() << "Skipping due to folder type: " << type;
+                return;
+            }
+        }
         auto ns = getNamespace(mailbox.name);
         auto folder = Folder{mailbox.name, ns, mailbox.separator, noselect, subscribed, flags};
 
diff --git a/examples/imapresource/imapserverproxy.h b/examples/imapresource/imapserverproxy.h
index f9b854b..86e3378 100644
--- a/examples/imapresource/imapserverproxy.h
+++ b/examples/imapresource/imapserverproxy.h
@@ -294,6 +294,7 @@ public:
     KAsync::Job<QVector<qint64>> fetchUids(const Folder &folder);
 
 private:
+    KAsync::Job<void> getMetaData(std::function<void(const QHash<QString, QMap<QByteArray, QByteArray> > &metadata)> callback);
     bool isGmail() const;
 
     QString getNamespace(const QString &name);