Merge branch 'feature/modelresult' into develop

1 files changed, 113 insertions, 4 deletions

diff --git a/common/clientapi.cpp b/common/clientapi.cpp
index f99ebb8..29b7e68 100644
--- a/common/clientapi.cpp
+++ b/common/clientapi.cpp
@@ -1,19 +1,47 @@
+/*
+ * Copyright (C) 2014 Christian Mollekopf <chrigi_1@fastmail.fm>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) version 3, or any
+ * later version accepted by the membership of KDE e.V. (or its
+ * successor approved by the membership of KDE e.V.), which shall
+ * act as a proxy defined in Section 6 of version 3 of the license.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "clientapi.h"
+
+#include <QtConcurrent/QtConcurrentRun>
+#include <QTimer>
+#include <QEventLoop>
+#include <QAbstractItemModel>
+#include <functional>
+#include <memory>
+
 #include "resourceaccess.h"
 #include "commands.h"
 #include "resourcefacade.h"
 #include "log.h"
 #include "definitions.h"
 #include "resourceconfig.h"
-#include <QtConcurrent/QtConcurrentRun>
-#include <QTimer>
+#include "facadefactory.h"
+#include "modelresult.h"
+#include "log.h"
 
 #define ASYNCINTHREAD
 
 namespace async
 {
-    void run(const std::function<void()> &runner) {
+    static void run(const std::function<void()> &runner) {
         auto timer = new QTimer();
         timer->setSingleShot(true);
         QObject::connect(timer, &QTimer::timeout, [runner, timer]() {
@@ -69,6 +97,76 @@ QList<QByteArray> Store::getResources(const QList<QByteArray> &resourceFilter, c
     return resources;
 }
 
+template <class DomainType>
+QSharedPointer<QAbstractItemModel> Store::loadModel(Query query)
+{
+    auto model = QSharedPointer<ModelResult<DomainType, typename DomainType::Ptr> >::create(query, query.requestedProperties.toList());
+
+    //* Client defines lifetime of model
+    //* The model lifetime defines the duration of live-queries
+    //* The facade needs to life for the duration of any calls being made (assuming we get rid of any internal callbacks
+    //* The emitter needs to live or the duration of query (respectively, the model)
+    //* The result provider needs to live for as long as results are provided (until the last thread exits).
+
+    // Query all resources and aggregate results
+    KAsync::iterate(getResources(query.resources, ApplicationDomain::getTypeName<DomainType>()))
+    .template each<void, QByteArray>([query, model](const QByteArray &resource, KAsync::Future<void> &future) {
+        auto facade = FacadeFactory::instance().getFacade<DomainType>(resourceName(resource), resource);
+        if (facade) {
+            Trace() << "Trying to fetch from resource";
+            auto result = facade->load(query);
+            auto emitter = result.second;
+            //TODO use aggregating emitter instead
+            model->setEmitter(emitter);
+            model->fetchMore(QModelIndex());
+            result.first.template then<void>([&future](){future.setFinished();}).exec();
+        } else {
+            //Ignore the error and carry on
+            future.setFinished();
+        }
+    }).exec();
+
+    return model;
+}
+
+template <class DomainType>
+static std::shared_ptr<StoreFacade<DomainType> > getFacade(const QByteArray &resourceInstanceIdentifier)
+{
+    if (auto facade = FacadeFactory::instance().getFacade<DomainType>(resourceName(resourceInstanceIdentifier), resourceInstanceIdentifier)) {
+        return facade;
+    }
+    return std::make_shared<NullFacade<DomainType> >();
+}
+
+template <class DomainType>
+KAsync::Job<void> Store::create(const DomainType &domainObject) {
+    //Potentially move to separate thread as well
+    auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
+    return facade->create(domainObject).template then<void>([facade](){}, [](int errorCode, const QString &error) {
+        Warning() << "Failed to create";
+    });
+}
+
+template <class DomainType>
+KAsync::Job<void> Store::modify(const DomainType &domainObject)
+{
+    //Potentially move to separate thread as well
+    auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
+    return facade->modify(domainObject).template then<void>([facade](){}, [](int errorCode, const QString &error) {
+        Warning() << "Failed to modify";
+    });
+}
+
+template <class DomainType>
+KAsync::Job<void> Store::remove(const DomainType &domainObject)
+{
+    //Potentially move to separate thread as well
+    auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
+    return facade->remove(domainObject).template then<void>([facade](){}, [](int errorCode, const QString &error) {
+        Warning() << "Failed to remove";
+    });
+}
+
 KAsync::Job<void> Store::shutdown(const QByteArray &identifier)
 {
     Trace() << "shutdown";
@@ -95,7 +193,7 @@ KAsync::Job<void> Store::synchronize(const Akonadi2::Query &query)
     .template each<void, QByteArray>([query](const QByteArray &resource, KAsync::Future<void> &future) {
         auto resourceAccess = QSharedPointer<Akonadi2::ResourceAccess>::create(resource);
         resourceAccess->open();
-        resourceAccess->synchronizeResource(true, false).then<void>([&future]() {
+        resourceAccess->synchronizeResource(query.syncOnDemand, query.processAll).then<void>([&future, resourceAccess]() {
             future.setFinished();
         }).exec();
     })
@@ -103,4 +201,15 @@ KAsync::Job<void> Store::synchronize(const Akonadi2::Query &query)
     .template then<void>([](){});
 }
 
+#define REGISTER_TYPE(T) template KAsync::Job<void> Store::remove<T>(const T &domainObject); \
+    template KAsync::Job<void> Store::create<T>(const T &domainObject); \
+    template KAsync::Job<void> Store::modify<T>(const T &domainObject); \
+    template QSharedPointer<QAbstractItemModel> Store::loadModel<T>(Query query); \
+
+REGISTER_TYPE(ApplicationDomain::Event);
+REGISTER_TYPE(ApplicationDomain::Mail);
+REGISTER_TYPE(ApplicationDomain::Folder);
+REGISTER_TYPE(ApplicationDomain::AkonadiResource);
+
 } // namespace Akonadi2
+