We can add resources.

6 files changed, 168 insertions, 4 deletions

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 9e30752..58c7ea0 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -26,6 +26,7 @@ set(command_SRCS
     threadboundary.cpp
     messagequeue.cpp
     index.cpp
+    resourcefacade.cpp
     domain/applicationdomaintype.cpp
     domain/event.cpp
     ${storage_SRCS})
diff --git a/common/clientapi.cpp b/common/clientapi.cpp
index 2f8763f..88349db 100644
--- a/common/clientapi.cpp
+++ b/common/clientapi.cpp
@@ -2,6 +2,7 @@
 #include "clientapi.h"
 #include "resourceaccess.h"
 #include "commands.h"
+#include "resourcefacade.h"
 #include "log.h"
 #include <QtConcurrent/QtConcurrentRun>
 
@@ -16,6 +17,11 @@ namespace async
 namespace Akonadi2
 {
 
+void FacadeFactory::registerStaticFacades()
+{
+    FacadeFactory::instance().registerFacade<Akonadi2::ApplicationDomain::AkonadiResource, ResourceFacade>("resourceconfig");
+}
+
 void Store::shutdown(const QByteArray &identifier)
 {
     Trace() << "shutdown";
diff --git a/common/clientapi.h b/common/clientapi.h
index 2d926fd..d658003 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -110,6 +110,8 @@ class FacadeFactory {
 public:
     typedef std::function<std::shared_ptr<void>(const QByteArray &)> FactoryFunction;
 
+    static void registerStaticFacades();
+
     //FIXME: proper singleton implementation
     static FacadeFactory &instance()
     {
@@ -179,6 +181,9 @@ public:
     static QByteArray resourceName(const QByteArray &instanceIdentifier)
     {
         auto split = instanceIdentifier.split('.');
+        if (split.size() <= 1) {
+            return instanceIdentifier;
+        }
         split.removeLast();
         return split.join('.');
     }
@@ -195,6 +200,7 @@ 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)
             .template each<void, QByteArray>([query, resultSet](const QByteArray &resource, KAsync::Future<void> &future) {
@@ -205,7 +211,6 @@ public:
                     //Keep the facade alive for the lifetime of the resultSet.
                     resultSet->setFacade(facade);
                 } else {
-                    qWarning() << "Could not find facade for resource " << resource;
                     //Ignore the error and carry on
                     future.setFinished();
                 }
@@ -245,7 +250,9 @@ public:
     static void create(const DomainType &domainObject, const QByteArray &resourceIdentifier) {
         //Potentially move to separate thread as well
         auto facade = FacadeFactory::instance().getFacade<DomainType>(resourceName(resourceIdentifier), resourceIdentifier);
-        facade->create(domainObject).exec().waitForFinished();
+        if (facade) {
+            facade->create(domainObject).exec().waitForFinished();
+        }
         //TODO return job?
     }
 
@@ -258,7 +265,9 @@ public:
     static void modify(const DomainType &domainObject, const QByteArray &resourceIdentifier) {
         //Potentially move to separate thread as well
         auto facade = FacadeFactory::instance().getFacade<DomainType>(resourceName(resourceIdentifier), resourceIdentifier);
-        facade->modify(domainObject).exec().waitForFinished();
+        if (facade) {
+            facade->modify(domainObject).exec().waitForFinished();
+        }
         //TODO return job?
     }
 
@@ -269,7 +278,9 @@ public:
     static void remove(const DomainType &domainObject, const QByteArray &resourceIdentifier) {
         //Potentially move to separate thread as well
         auto facade = FacadeFactory::instance().getFacade<DomainType>(resourceName(resourceIdentifier), resourceIdentifier);
-        facade->remove(domainObject).exec().waitForFinished();
+        if (facade) {
+            facade->remove(domainObject).exec().waitForFinished();
+        }
         //TODO return job?
     }
 
diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp
new file mode 100644
index 0000000..2c6eabc
--- /dev/null
+++ b/common/resourcefacade.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2014 Christian Mollekopf <chrigi_1@fastmail.fm>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ */
+#include "resourcefacade.h"
+
+#include <QSettings>
+#include <QStandardPaths>
+
+ResourceFacade::ResourceFacade(const QByteArray &)
+    : Akonadi2::StoreFacade<Akonadi2::ApplicationDomain::AkonadiResource>()
+{
+
+}
+
+ResourceFacade::~ResourceFacade()
+{
+
+}
+
+static QSharedPointer<QSettings> getSettings()
+{
+    return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/resources.ini", QSettings::IniFormat);
+}
+
+KAsync::Job<void> ResourceFacade::create(const Akonadi2::ApplicationDomain::AkonadiResource &resource)
+{
+    return KAsync::start<void>([resource, this]() {
+        auto settings = getSettings();
+        const QByteArray identifier = resource.getProperty("identifier").toByteArray();
+        const QByteArray type = resource.getProperty("type").toByteArray();
+
+        settings->beginGroup("resources");
+        settings->setValue(identifier, type);
+        settings->endGroup();
+        settings->beginGroup(identifier);
+        //Add some settings?
+        settings->endGroup();
+        settings->sync();
+    });
+}
+
+KAsync::Job<void> ResourceFacade::modify(const Akonadi2::ApplicationDomain::AkonadiResource &resource)
+{
+    return KAsync::null<void>();
+}
+
+KAsync::Job<void> ResourceFacade::remove(const Akonadi2::ApplicationDomain::AkonadiResource &resource)
+{
+    return KAsync::start<void>([resource, this]() {
+        auto settings = getSettings();
+        const QByteArray identifier = resource.getProperty("identifier").toByteArray();
+
+        settings->beginGroup("resources");
+        settings->remove(identifier);
+        settings->endGroup();
+        settings->sync();
+    });
+}
+
+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]() {
+        auto settings = getSettings();
+        settings->beginGroup("resources");
+        for (const auto &identifier : settings->childKeys()) {
+            const auto type = settings->value(identifier).toByteArray();
+            auto resource = Akonadi2::ApplicationDomain::AkonadiResource::Ptr::create();
+            resource->setProperty("identifier", identifier);
+            resource->setProperty("type", type);
+            resultProvider->add(resource);
+        }
+        settings->endGroup();
+
+        //TODO initialResultSetComplete should be implicit
+        resultProvider->initialResultSetComplete();
+        resultProvider->complete();
+    });
+}
+
diff --git a/common/resourcefacade.h b/common/resourcefacade.h
new file mode 100644
index 0000000..2b36f21
--- /dev/null
+++ b/common/resourcefacade.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 Christian Mollekopf <chrigi_1@fastmail.fm>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ */
+
+#pragma once
+
+#include "common/clientapi.h"
+#include "common/resultprovider.h"
+
+class ResourceFacade : public Akonadi2::StoreFacade<Akonadi2::ApplicationDomain::AkonadiResource>
+{
+public:
+    ResourceFacade(const QByteArray &instanceIdentifier);
+    virtual ~ResourceFacade();
+    KAsync::Job<void> create(const Akonadi2::ApplicationDomain::AkonadiResource &resource) Q_DECL_OVERRIDE;
+    KAsync::Job<void> modify(const Akonadi2::ApplicationDomain::AkonadiResource &resource) Q_DECL_OVERRIDE;
+    KAsync::Job<void> remove(const Akonadi2::ApplicationDomain::AkonadiResource &resource) Q_DECL_OVERRIDE;
+    KAsync::Job<void> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<typename Akonadi2::ApplicationDomain::AkonadiResource::Ptr> > &resultProvider) Q_DECL_OVERRIDE;
+};
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index a874dd7..e7db0d0 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -174,6 +174,24 @@ private Q_SLOTS:
         QTRY_VERIFY(!facade->capturedResultProvider);
     }
 
+    void resourceManagement()
+    {
+        Akonadi2::FacadeFactory::registerStaticFacades();
+        Akonadi2::ApplicationDomain::AkonadiResource res;
+        res.setProperty("identifier", "identifier1");
+        res.setProperty("type", "dummyresource");
+
+        Akonadi2::Store::create(res, "resourceconfig");
+
+        {
+            Akonadi2::Query query;
+            query.resources << "resourceconfig";
+            async::SyncListResult<Akonadi2::ApplicationDomain::AkonadiResource::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::AkonadiResource>(query));
+            result.exec();
+            QCOMPARE(result.size(), 1);
+        }
+    }
+
 };
 
 QTEST_MAIN(ClientAPITest)