DummyResourceTest and QueryTest are passing

sync has been removed from the query code and is now a separate step

1 files changed, 14 insertions, 175 deletions

diff --git a/common/resultprovider.h b/common/resultprovider.h
index 43d21a4..0d23127 100644
--- a/common/resultprovider.h
+++ b/common/resultprovider.h
@@ -23,6 +23,9 @@
 #include <functional>
 #include <memory>
 #include "threadboundary.h"
+#include "resultset.h"
+#include "log.h"
+#include "modelresult.h"
 
 using namespace async;
 
@@ -117,18 +120,6 @@ public:
         // mResultEmitter->clear();
     }
 
-    // QSharedPointer<ResultEmitter<T> > emitter()
-    // {
-    //     if (!mResultEmitter) {
-    //         //We have to go over a separate var and return that, otherwise we'd delete the emitter immediately again
-    //         auto sharedPtr = QSharedPointer<ResultEmitter<T> >(new ResultEmitter<T>, [this](ResultEmitter<T> *emitter){ done(); delete emitter; });
-    //         mResultEmitter = sharedPtr;
-    //         return sharedPtr;
-    //     }
-    //
-    //     return mResultEmitter.toStrongRef();
-    // }
-
     /**
      * For lifetimemanagement only.
      * We keep the runner alive as long as the result provider exists.
@@ -162,40 +153,6 @@ public:
         mQueryRunner = runner;
     }
 
-    // qint64 fetch(const ResultSet &resultSet)
-    // {
-    //     //Fetch a bunch
-    //     //
-    //     // Akonadi2::Storage storage(Akonadi2::storageLocation(), mResourceInstanceIdentifier);
-    //     // storage.setDefaultErrorHandler([](const Akonadi2::Storage::Error &error) {
-    //     //     Warning() << "Error during query: " << error.store << error.message;
-    //     // });
-    //     //
-    //     // auto transaction = storage.createTransaction(Akonadi2::Storage::ReadOnly);
-    //
-    //     // Log() << "Querying" << baseRevision << Akonadi2::Storage::maxRevision(transaction);
-    //     // auto resultSet = getResultSet(query, transaction, baseRevision);
-    //     while (resultSet.next([this](const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &value, Akonadi2::Operation operation) -> bool {
-    //         switch (operation) {
-    //         case Akonadi2::Operation_Creation:
-    //             Trace() << "Got creation";
-    //             //TODO Only copy in result provider
-    //             add(Akonadi2::ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<T>(*value).template staticCast<T>());
-    //             break;
-    //         case Akonadi2::Operation_Modification:
-    //             Trace() << "Got modification";
-    //             modify(Akonadi2::ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<T>(*value).template staticCast<T>());
-    //             break;
-    //         case Akonadi2::Operation_Removal:
-    //             Trace() << "Got removal";
-    //             remove(Akonadi2::ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<T>(*value).template staticCast<T>());
-    //             break;
-    //         }
-    //         return true;
-    //     })){};
-    //     // return Akonadi2::Storage::maxRevision(transaction);
-    // }
-
 private:
     void done()
     {
@@ -212,129 +169,6 @@ private:
     std::function<void()> mOnDoneCallback;
 };
 
-
-
-
-
-
-template<class T>
-class SyncResultProvider : public ResultProviderInterface<T> {
-public:
-    void add(const T &value)
-    {
-        mResultEmitter->addHandler(value);
-    }
-
-    void modify(const T &value)
-    {
-        mResultEmitter->modifyHandler(value);
-    }
-
-    void remove(const T &value)
-    {
-        mResultEmitter->removeHandler(value);
-    }
-
-    void initialResultSetComplete()
-    {
-        mResultEmitter->initialResultSetComplete();
-    }
-
-    void complete()
-    {
-        mResultEmitter->complete();
-    }
-
-    void clear()
-    {
-        mResultEmitter->clear();
-    }
-
-    QSharedPointer<ResultEmitter<T> > emitter()
-    {
-        if (!mResultEmitter) {
-            //We have to go over a separate var and return that, otherwise we'd delete the emitter immediately again
-            auto sharedPtr = QSharedPointer<ResultEmitter<T> >(new ResultEmitter<T>, [this](ResultEmitter<T> *emitter){ done(); delete emitter; });
-            mResultEmitter = sharedPtr;
-            return sharedPtr;
-        }
-
-        return mResultEmitter.toStrongRef();
-    }
-
-    /**
-     * For lifetimemanagement only.
-     * We keep the runner alive as long as the result provider exists.
-     */
-    void setFacade(const std::shared_ptr<void> &facade)
-    {
-        mFacade = facade;
-    }
-
-    void onDone(const std::function<void()> &callback)
-    {
-        mOnDoneCallback = callback;
-    }
-
-    bool isDone() const
-    {
-        //The existance of the emitter currently defines wether we're done or not.
-        return mResultEmitter.toStrongRef().isNull();
-    }
-
-    // qint64 fetch(const ResultSet &resultSet)
-    // {
-    //     //Fetch a bunch
-    //     //
-    //     // Akonadi2::Storage storage(Akonadi2::storageLocation(), mResourceInstanceIdentifier);
-    //     // storage.setDefaultErrorHandler([](const Akonadi2::Storage::Error &error) {
-    //     //     Warning() << "Error during query: " << error.store << error.message;
-    //     // });
-    //     //
-    //     // auto transaction = storage.createTransaction(Akonadi2::Storage::ReadOnly);
-    //
-    //     // Log() << "Querying" << baseRevision << Akonadi2::Storage::maxRevision(transaction);
-    //     // auto resultSet = getResultSet(query, transaction, baseRevision);
-    //     while (resultSet.next([this](const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &value, Akonadi2::Operation operation) -> bool {
-    //         switch (operation) {
-    //         case Akonadi2::Operation_Creation:
-    //             Trace() << "Got creation";
-    //             //TODO Only copy in result provider
-    //             add(Akonadi2::ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<T>(*value).template staticCast<T>());
-    //             break;
-    //         case Akonadi2::Operation_Modification:
-    //             Trace() << "Got modification";
-    //             modify(Akonadi2::ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<T>(*value).template staticCast<T>());
-    //             break;
-    //         case Akonadi2::Operation_Removal:
-    //             Trace() << "Got removal";
-    //             remove(Akonadi2::ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<T>(*value).template staticCast<T>());
-    //             break;
-    //         }
-    //         return true;
-    //     })){};
-    //     // return Akonadi2::Storage::maxRevision(transaction);
-    // }
-
-private:
-    void done()
-    {
-        qWarning() << "done";
-        if (mOnDoneCallback) {
-            mOnDoneCallback();
-            mOnDoneCallback = std::function<void()>();
-        }
-    }
-
-    QWeakPointer<ResultEmitter<T> > mResultEmitter;
-    std::shared_ptr<void> mFacade;
-    std::function<void()> mOnDoneCallback;
-    QSharedPointer<ThreadBoundary> mThreadBoundary;
-};
-
-
-
-
 /*
 * The promise side for the result emitter
 */
@@ -434,18 +268,18 @@ public:
     }
 
     /**
-        * For lifetimemanagement only.
-        * We keep the runner alive as long as the result provider exists.
-        */
+     * For lifetimemanagement only.
+     * We keep the runner alive as long as the result provider exists.
+     */
     void setQueryRunner(const QSharedPointer<QObject> &runner)
     {
         mQueryRunner = runner;
     }
 
     /**
-        * For lifetimemanagement only.
-        * We keep the runner alive as long as the result provider exists.
-        */
+     * For lifetimemanagement only.
+     * We keep the runner alive as long as the result provider exists.
+     */
     void setFacade(const std::shared_ptr<void> &facade)
     {
         mFacade = facade;
@@ -463,6 +297,11 @@ public:
         return mResultEmitter.toStrongRef().isNull();
     }
 
+    void setFetcher(const std::function<void(const QByteArray &parent)> &fetcher)
+    {
+        fetcher(QByteArray());
+    }
+
 private:
     void done()
     {