6 files changed, 88 insertions, 48 deletions

diff --git a/common/clientapi.cpp b/common/clientapi.cpp
index 88349db..06bf5ab 100644
--- a/common/clientapi.cpp
+++ b/common/clientapi.cpp
@@ -19,7 +19,7 @@ namespace Akonadi2
 
 void FacadeFactory::registerStaticFacades()
 {
-    FacadeFactory::instance().registerFacade<Akonadi2::ApplicationDomain::AkonadiResource, ResourceFacade>("resourceconfig");
+    registerFacade<Akonadi2::ApplicationDomain::AkonadiResource, ResourceFacade>("resourceconfig");
 }
 
 void Store::shutdown(const QByteArray &identifier)
diff --git a/common/clientapi.h b/common/clientapi.h
index d658003..a01db23 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -34,6 +34,7 @@
 #include "threadboundary.h"
 #include "resultprovider.h"
 #include "domain/applicationdomaintype.h"
+#include "resourceconfig.h"
 
 namespace async {
     //This should abstract if we execute from eventloop or in thread.
@@ -110,7 +111,7 @@ class FacadeFactory {
 public:
     typedef std::function<std::shared_ptr<void>(const QByteArray &)> FactoryFunction;
 
-    static void registerStaticFacades();
+    void registerStaticFacades();
 
     //FIXME: proper singleton implementation
     static FacadeFactory &instance()
@@ -165,6 +166,11 @@ public:
     }
 
 private:
+    FacadeFactory()
+    {
+        registerStaticFacades();
+    }
+
     QHash<QByteArray, FactoryFunction> mFacadeRegistry;
 };
 
@@ -188,6 +194,27 @@ public:
         return split.join('.');
     }
 
+    static QList<QByteArray> getResources(const QList<QByteArray> &resourceFilter)
+    {
+        QList<QByteArray> resources;
+        const auto configuredResources = ResourceConfig::getResources();
+        if (resourceFilter.isEmpty()) {
+            for (const auto &res : configuredResources) {
+                //TODO filter by type
+                resources << res;
+            }
+        } else {
+            for (const auto &res : resourceFilter) {
+                if (configuredResources.contains(res)) {
+                    resources << res;
+                } else {
+                    qWarning() << "Resource is not existing: " << res;
+                }
+            }
+        }
+        return resources;
+    }
+
     /**
      * Asynchronusly load a dataset
      */
@@ -200,9 +227,8 @@ public:
         //We must guarantee that the emitter is returned before the first result is emitted.
         //The result provider must be threadsafe.
         async::run([query, resultSet](){
-            //TODO if query.resources is empty, search for all resource that provide the type we're looking for
             // Query all resources and aggregate results
-            KAsync::iterate(query.resources)
+            KAsync::iterate(getResources(query.resources))
             .template each<void, QByteArray>([query, resultSet](const QByteArray &resource, KAsync::Future<void> &future) {
                 //TODO pass resource identifier to factory
                 auto facade = FacadeFactory::instance().getFacade<DomainType>(resourceName(resource), resource);
diff --git a/common/resourceconfig.cpp b/common/resourceconfig.cpp
index 1f8fcda..ec72fb9 100644
--- a/common/resourceconfig.cpp
+++ b/common/resourceconfig.cpp
@@ -30,33 +30,38 @@ static QSharedPointer<QSettings> getSettings()
 void ResourceConfig::addResource(const QByteArray &identifier, const QByteArray &type)
 {
     auto settings = getSettings();
-    settings->beginGroup("resources");
-    settings->setValue(QString::fromLatin1(identifier), type);
+    settings->beginGroup(QString::fromLatin1(identifier));
+    settings->setValue("type", type);
+    settings->setValue("enabled", true);
     settings->endGroup();
-    // settings->beginGroup(identifier);
-    // //Add some settings?
-    // settings->endGroup();
     settings->sync();
 }
 
 void ResourceConfig::removeResource(const QByteArray &identifier)
 {
     auto settings = getSettings();
-    settings->beginGroup("resources");
-    settings->remove(QString::fromLatin1(identifier));
+    settings->beginGroup(QString::fromLatin1(identifier));
+    settings->remove("");
     settings->endGroup();
     settings->sync();
 }
 
-QList<QPair<QByteArray, QByteArray> > ResourceConfig::getResources()
+QMap<QByteArray, QByteArray> ResourceConfig::getResources()
 {
-    QList<QPair<QByteArray, QByteArray> > resources;
+    QMap<QByteArray, QByteArray> resources;
     auto settings = getSettings();
-    settings->beginGroup("resources");
-    for (const auto &identifier : settings->childKeys()) {
-        const auto type = settings->value(identifier).toByteArray();
-        resources << qMakePair<QByteArray, QByteArray>(identifier.toLatin1(), type);
+    for (const auto &identifier : settings->childGroups()) {
+        settings->beginGroup(identifier);
+        const auto type = settings->value("type").toByteArray();
+        resources.insert(identifier.toLatin1(), type);
+        settings->endGroup();
     }
-    settings->endGroup();
     return resources;
 }
+
+void ResourceConfig::clear()
+{
+    auto settings = getSettings();
+    settings->clear();
+    settings->sync();
+}
diff --git a/common/resourceconfig.h b/common/resourceconfig.h
index eda870f..e1ba2bc 100644
--- a/common/resourceconfig.h
+++ b/common/resourceconfig.h
@@ -21,12 +21,13 @@
 
 #include <QList>
 #include <QByteArray>
-#include <QPair>
+#include <QMap>
 
 class ResourceConfig
 {
 public:
-    static QList<QPair<QByteArray, QByteArray> > getResources();
+    static QMap<QByteArray, QByteArray> getResources();
     static void addResource(const QByteArray &identifier, const QByteArray &type);
     static void removeResource(const QByteArray &identifier);
+    static void clear();
 };
diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp
index 63b3126..9792934 100644
--- a/common/resourcefacade.cpp
+++ b/common/resourcefacade.cpp
@@ -56,11 +56,15 @@ KAsync::Job<void> ResourceFacade::remove(const Akonadi2::ApplicationDomain::Akon
 KAsync::Job<void> ResourceFacade::load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<typename Akonadi2::ApplicationDomain::AkonadiResource::Ptr> > &resultProvider)
 {
     return KAsync::start<void>([query, resultProvider]() {
-        for (const auto &res : ResourceConfig::getResources()) {
-            auto resource = Akonadi2::ApplicationDomain::AkonadiResource::Ptr::create();
-            resource->setProperty("identifier", res.first);
-            resource->setProperty("type", res.second);
-            resultProvider->add(resource);
+        const auto configuredResources = ResourceConfig::getResources();
+        for (const auto &res : configuredResources.keys()) {
+            const auto type = configuredResources.value(res);
+            if (!query.propertyFilter.contains("type") || query.propertyFilter.value("type").toByteArray() == type) {
+                auto resource = Akonadi2::ApplicationDomain::AkonadiResource::Ptr::create();
+                resource->setProperty("identifier", res);
+                resource->setProperty("type", type);
+                resultProvider->add(resource);
+            }
         }
         //TODO initialResultSetComplete should be implicit
         resultProvider->initialResultSetComplete();
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 5eb16da..9b8c27e 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -5,6 +5,7 @@
 #include "clientapi.h"
 #include "facade.h"
 #include "synclistresult.h"
+#include "resourceconfig.h"
 
 class RevisionNotifier : public QObject
 {
@@ -99,21 +100,29 @@ class ClientAPITest : public QObject
     Q_OBJECT
 private Q_SLOTS:
 
+    static std::shared_ptr<DummyResourceFacade> registerDummyFacade()
+    {
+        auto facade = std::make_shared<DummyResourceFacade>();
+        Akonadi2::FacadeFactory::instance().registerFacade<Akonadi2::ApplicationDomain::Event, DummyResourceFacade>("dummyresource",
+            [facade](const QByteArray &instanceIdentifier) {
+                return facade;
+            }
+        );
+        return facade;
+    }
+
     void initTestCase()
     {
         Akonadi2::FacadeFactory::instance().resetFactory();
+        ResourceConfig::clear();
     }
 
+
     void testLoad()
     {
-        auto facade = std::make_shared<DummyResourceFacade>();
+        auto facade = registerDummyFacade();
         facade->results << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
-
-        Akonadi2::FacadeFactory::instance().registerFacade<Akonadi2::ApplicationDomain::Event, DummyResourceFacade>("dummyresource",
-            [facade](const QByteArray &instanceIdentifier) {
-                return facade;
-            }
-        );
+        ResourceConfig::addResource("dummyresource.instance1", "dummyresource");
 
         Akonadi2::Query query;
         query.resources << "dummyresource.instance1";
@@ -126,14 +135,9 @@ private Q_SLOTS:
 
     void testLiveQuery()
     {
-        auto facade = std::make_shared<DummyResourceFacade>();
+        auto facade = registerDummyFacade();
         facade->results << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
-
-        Akonadi2::FacadeFactory::instance().registerFacade<Akonadi2::ApplicationDomain::Event, DummyResourceFacade>("dummyresource",
-            [facade](const QByteArray &instanceIdentifier){
-                return facade;
-            }
-        );
+        ResourceConfig::addResource("dummyresource.instance1", "dummyresource");
 
         Akonadi2::Query query;
         query.resources << "dummyresource.instance1";
@@ -152,14 +156,9 @@ private Q_SLOTS:
 
     void testQueryLifetime()
     {
-        auto facade = std::make_shared<DummyResourceFacade>();
+        auto facade = registerDummyFacade();
         facade->results << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
-
-        Akonadi2::FacadeFactory::instance().registerFacade<Akonadi2::ApplicationDomain::Event, DummyResourceFacade>("dummyresource",
-            [facade](const QByteArray &instanceIdentifier){
-                return facade;
-            }
-        );
+        ResourceConfig::addResource("dummyresource.instance1", "dummyresource");
 
         Akonadi2::Query query;
         query.resources << "dummyresource.instance1";
@@ -176,9 +175,12 @@ private Q_SLOTS:
 
     void resourceManagement()
     {
-        Akonadi2::FacadeFactory::registerStaticFacades();
+        ResourceConfig::clear();
+        Akonadi2::FacadeFactory::instance().registerStaticFacades();
+        ResourceConfig::addResource("resourceconfig", "resourceconfig");
+
         Akonadi2::ApplicationDomain::AkonadiResource res;
-        res.setProperty("identifier", "identifier1");
+        res.setProperty("identifier", "dummyresource.identifier1");
         res.setProperty("type", "dummyresource");
 
         Akonadi2::Store::create(res, "resourceconfig");
@@ -186,6 +188,7 @@ private Q_SLOTS:
         {
             Akonadi2::Query query;
             query.resources << "resourceconfig";
+            query.propertyFilter.insert("type", "dummyresource");
             async::SyncListResult<Akonadi2::ApplicationDomain::AkonadiResource::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::AkonadiResource>(query));
             result.exec();
             QCOMPARE(result.size(), 1);
@@ -195,6 +198,7 @@ private Q_SLOTS:
         {
             Akonadi2::Query query;
             query.resources << "resourceconfig";
+            query.propertyFilter.insert("type", "dummyresource");
             async::SyncListResult<Akonadi2::ApplicationDomain::AkonadiResource::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::AkonadiResource>(query));
             result.exec();
             QCOMPARE(result.size(), 0);