From e2857def8e67c3a95656f9d4737beba93a38c53a Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Sat, 18 Apr 2015 10:26:47 +0200
Subject: Moved generic part of load to GenericFacade

---
 dummyresource/facade.cpp | 42 +-----------------------------------------
 dummyresource/facade.h   |  1 -
 2 files changed, 1 insertion(+), 42 deletions(-)

(limited to 'dummyresource')

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)>);
-- 
cgit v1.2.3