Moved generic part of load to GenericFacade

4 files changed, 47 insertions, 43 deletions

diff --git a/common/clientapi.h b/common/clientapi.h
index c2b9493..88bc38c 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -365,7 +365,7 @@ public:
     virtual Async::Job<void> modify(const DomainType &domainObject) = 0;
     virtual Async::Job<void> remove(const DomainType &domainObject) = 0;
     //TODO remove from public API
-    virtual Async::Job<qint64> load(const Query &query, const std::function<void(const typename DomainType::Ptr &)> &resultCallback) = 0;
+    // virtual Async::Job<qint64> load(const Query &query, const std::function<void(const typename DomainType::Ptr &)> &resultCallback) = 0;
     virtual Async::Job<void> load(const Query &query, const QSharedPointer<ResultProvider<typename DomainType::Ptr> > &resultProvider) { return Async::null<void>(); };
 };
 
diff --git a/common/facade.h b/common/facade.h
index f9b5a83..6c1ad67 100644
--- a/common/facade.h
+++ b/common/facade.h
@@ -29,6 +29,7 @@
 #include "createentity_generated.h"
 #include "domainadaptor.h"
 #include "entitybuffer.h"
+#include "log.h"
 
 /**
  * A QueryRunner runs a query and updates the corresponding result set.
@@ -98,6 +99,48 @@ public:
     {
     }
 
+    //TODO JOBAPI return job from sync continuation to execute it as subjob?
+    Async::Job<void> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<typename DomainType::Ptr> > &resultProvider) Q_DECL_OVERRIDE
+    {
+        auto runner = QSharedPointer<QueryRunner>::create(query);
+        QWeakPointer<Akonadi2::ResultProvider<typename DomainType::Ptr> > weakResultProvider = resultProvider;
+        runner->setQuery([this, weakResultProvider, query] (qint64 oldRevision, qint64 newRevision) -> Async::Job<qint64> {
+            return Async::start<qint64>([this, weakResultProvider, query](Async::Future<qint64> &future) {
+                auto resultProvider = weakResultProvider.toStrongRef();
+                if (!resultProvider) {
+                    Warning() << "Tried executing query after result provider is already gone";
+                    future.setError(0, QString());
+                    future.setFinished();
+                    return;
+                }
+                //TODO only emit changes and don't replace everything
+                resultProvider->clear();
+                //rerun query
+                auto addCallback = std::bind(&Akonadi2::ResultProvider<typename DomainType::Ptr>::add, resultProvider, std::placeholders::_1);
+                load(query, addCallback).template then<void, qint64>([resultProvider, &future](qint64 queriedRevision) {
+                    //TODO set revision in result provider?
+                    //TODO update all existing results with new revision
+                    resultProvider->complete();
+                    future.setValue(queriedRevision);
+                    future.setFinished();
+                }).exec();
+            });
+        });
+
+        //In case of a live query we keep the runner for as long alive as the result provider exists
+        if (query.liveQuery) {
+            resultProvider->setQueryRunner(runner);
+            QObject::connect(mResourceAccess.data(), &Akonadi2::ResourceAccess::revisionChanged, runner.data(), &QueryRunner::revisionChanged);
+        }
+
+        //We have to capture the runner to keep it alive
+        return synchronizeResource(query.syncOnDemand, query.processAll).template then<void>([runner](Async::Future<void> &future) {
+            runner->run().then<void>([&future]() {
+                future.setFinished();
+            }).exec();
+        });
+    }
+
 protected:
     Async::Job<void> sendCreateCommand(const QByteArray &t, const QByteArray &buffer)
     {
@@ -129,6 +172,8 @@ protected:
         return Async::null<void>();
     }
 
+    virtual Async::Job<qint64> load(const Akonadi2::Query &query, const std::function<void(const typename DomainType::Ptr &)> &resultCallback) { return Async::null<qint64>(); };
+
 protected:
     //TODO use one resource access instance per application => make static
     QSharedPointer<Akonadi2::ResourceAccess> mResourceAccess;
diff --git a/dummyresource/facade.cpp b/dummyresource/facade.cpp
index da2a27a..e50e4f3 100644
--- a/dummyresource/facade.cpp
+++ b/dummyresource/facade.cpp
@@ -147,49 +147,9 @@ void DummyResourceFacade::readValue(QSharedPointer<Akonadi2::Storage> storage, c
     });
 }
 
-Async::Job<void> DummyResourceFacade::load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> > &resultProvider)
-{
-    auto runner = QSharedPointer<QueryRunner>::create(query);
-    QWeakPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> > weakResultProvider = resultProvider;
-    runner->setQuery([this, weakResultProvider, query] (qint64 oldRevision, qint64 newRevision) -> Async::Job<qint64> {
-        return Async::start<qint64>([this, weakResultProvider, query](Async::Future<qint64> &future) {
-            auto resultProvider = weakResultProvider.toStrongRef();
-            if (!resultProvider) {
-                Warning() << "Tried executing query after result provider is already gone";
-                future.setError(0, QString());
-                future.setFinished();
-                return;
-            }
-            //TODO only emit changes and don't replace everything
-            resultProvider->clear();
-            //rerun query
-            auto addCallback = std::bind(&Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr>::add, resultProvider, std::placeholders::_1);
-            load(query, addCallback).then<void, qint64>([resultProvider, &future](qint64 queriedRevision) {
-                //TODO set revision in result provider?
-                //TODO update all existing results with new revision
-                resultProvider->complete();
-                future.setValue(queriedRevision);
-                future.setFinished();
-            }).exec();
-        });
-    });
-
-    //In case of a live query we keep the runner for as long alive as the result provider exists
-    if (query.liveQuery) {
-        resultProvider->setQueryRunner(runner);
-        QObject::connect(mResourceAccess.data(), &Akonadi2::ResourceAccess::revisionChanged, runner.data(), &QueryRunner::revisionChanged);
-    }
-
-    return Async::start<void>([runner](Async::Future<void> &future) {
-        runner->run().then<void>([&future]() {
-            future.setFinished();
-        }).exec();
-    });
-}
-
 Async::Job<qint64> DummyResourceFacade::load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::ApplicationDomain::Event::Ptr &)> &resultCallback)
 {
-    return synchronizeResource(query.syncOnDemand, query.processAll).then<qint64>([=](Async::Future<qint64> &future) {
+    return Async::start<qint64>([=](Async::Future<qint64> &future) {
         //Now that the sync is complete we can execute the query
         const auto preparedQuery = prepareQuery(query);
 
diff --git a/dummyresource/facade.h b/dummyresource/facade.h
index 3ddfe15..91ae351 100644
--- a/dummyresource/facade.h
+++ b/dummyresource/facade.h
@@ -38,7 +38,6 @@ public:
     Async::Job<void> modify(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE;
     Async::Job<void> remove(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE;
     Async::Job<qint64> load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::ApplicationDomain::Event::Ptr &)> &resultCallback) Q_DECL_OVERRIDE;
-    Async::Job<void> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> > &resultProvider) Q_DECL_OVERRIDE;
 
 private:
     void readValue(QSharedPointer<Akonadi2::Storage> storage, const QByteArray &key, const std::function<void(const Akonadi2::ApplicationDomain::Event::Ptr &)> &resultCallback, std::function<bool(const std::string &key, DummyCalendar::DummyEvent const *buffer, Akonadi2::ApplicationDomain::Buffer::Event const *local)>);