dummyresource that doesn't work yet

8 files changed, 168 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0313b65..392ca39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,4 +50,7 @@ add_subdirectory(resource)
 # the store
 add_subdirectory(store)
 
+# a simple dummy resource implementation
+add_subdirectory(dummyresource)
+
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/dummyresource/CMakeLists.txt b/dummyresource/CMakeLists.txt
new file mode 100644
index 0000000..9d28c0b
--- /dev/null
+++ b/dummyresource/CMakeLists.txt
@@ -0,0 +1,15 @@
+project(akonadinext_dummyresource)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+
+generate_flatbuffers(dummycalendar)
+
+#Client plugin
+add_library(${PROJECT_NAME}_facade SHARED facade.cpp)
+target_link_libraries(${PROJECT_NAME}_facade akonadinextcommon)
+qt5_use_modules(${PROJECT_NAME}_facade Widgets Network)
+#install(TARGETS ${PROJECT_NAME}_facade DESTINATION bin)
+
+#Syncronizer
+
+#add_subdirectory(test)
diff --git a/dummyresource/dummycalendar.fbs b/dummyresource/dummycalendar.fbs
new file mode 100644
index 0000000..551f5cb
--- /dev/null
+++ b/dummyresource/dummycalendar.fbs
@@ -0,0 +1,12 @@
+// example IDL file
+
+namespace DummyCalendar;
+
+table DummyEvent {
+  summary:string;
+  description:string;
+  attachment:[byte];
+}
+
+root_type DummyEvent;
+file_identifier "AKFB";
diff --git a/dummyresource/facade.cpp b/dummyresource/facade.cpp
new file mode 100644
index 0000000..288552c
--- /dev/null
+++ b/dummyresource/facade.cpp
@@ -0,0 +1,92 @@
+#include "facade.h"
+
+#include <QDebug>
+#include <functional>
+#include "client/resourceaccess.h"
+#include "dummycalendar_generated.h"
+
+using namespace DummyCalendar;
+using namespace flatbuffers;
+
+DummyResourceFacade::DummyResourceFacade()
+    : Akonadi2::StoreFacade<Akonadi2::Domain::Event>(),
+    mResourceAccess(new ResourceAccess("dummyresource")),
+    mDatabase(new Database("dummyresource"))
+{
+    // connect(mResourceAccess.data(), &ResourceAccess::ready, this, onReadyChanged);
+}
+
+DummyResourceFacade::~DummyResourceFacade()
+{
+}
+
+void DummyResourceFacade::create(const Akonadi2::Domain::Event &domainObject)
+{
+    //Create message buffer and send to resource
+}
+
+void DummyResourceFacade::modify(const Akonadi2::Domain::Event &domainObject)
+{
+    //Create message buffer and send to resource
+}
+
+void DummyResourceFacade::remove(const Akonadi2::Domain::Event &domainObject)
+{
+    //Create message buffer and send to resource
+}
+
+//Key.value property map using enum or strings with qvariant, or rather typesafe API?
+//typesafe is a shitload more work that we can avoid
+//
+//The Event base implementaiton could take a pointer to a single property mapper,
+//and a void pointer to the mmapped region. => event is copyable and stack allocatable and we avoid large amounts of heap allocated objects
+//-The mapper should in this case live in the other thread
+//-default property mapper implementation can answer "is property X supported?"
+//-how do we free/munmap the data if we don't know when no one references it any longer? => no munmap needed, but read transaction to keep pointer alive
+//-we could bind the lifetime to the query
+//=> perhaps do heap allocate and use smart pointer?
+class DummyEventAdaptor : public Akonadi2::Domain::Event {
+public:
+    DummyEventAdaptor(const QString &resource, const QString &identifier, qint64 revision):Akonadi2::Domain::Event(resource, identifier, revision){};
+
+    // void setProperty(const QString &key, const QVariant &value)
+    // {
+    //     //Record changes to send to resource?
+    //     //The buffer is readonly
+    // }
+
+    virtual QVariant getProperty(const QString &key) const
+    {
+        if (key == "summary") {
+            //FIXME how do we check availability for on-demand request?
+            return QString::fromStdString(buffer->summary()->c_str());
+        }
+        return QVariant();
+    }
+
+    //Data is read-only
+    DummyEvent const *buffer;
+};
+
+static Akonadi2::Domain::Event::Ptr createEvent(const std::string &data)
+{
+    //We will have to buffers stored after each other
+    auto eventBuffer = GetDummyEvent(data.c_str());
+    auto event = QSharedPointer<DummyEventAdaptor>::create("dummyresource", "key", 0);
+    event->buffer = eventBuffer;
+    // qDebug() << readEvent->summary()->c_str();
+    return event;
+}
+
+void DummyResourceFacade::load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::Domain::Event::Ptr &)> &resultCallback)
+{
+    qDebug() << "load called";
+    //TODO only read values matching the query
+    //FIXME the interface should probably simply return a void pointer + size
+    mDatabase->read("", [resultCallback](const std::string &result) {
+        resultCallback(createEvent(result));
+    });
+}
+
+//TODO call in plugin loader
+// Akonadi2::FacadeFactory::instance().registerFacade<Akonadi2::Domain::Event, DummyResourceFacade>("dummyresource", [facade](){ return new DummyResourceFacade(facade); });
diff --git a/dummyresource/facade.h b/dummyresource/facade.h
new file mode 100644
index 0000000..7a516de
--- /dev/null
+++ b/dummyresource/facade.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "client/clientapi.h"
+#include "store/database.h"
+
+class ResourceAccess;
+
+class DummyResourceFacade : public Akonadi2::StoreFacade<Akonadi2::Domain::Event>
+{
+public:
+    DummyResourceFacade();
+    virtual ~DummyResourceFacade();
+    virtual void create(const Akonadi2::Domain::Event &domainObject);
+    virtual void modify(const Akonadi2::Domain::Event &domainObject);
+    virtual void remove(const Akonadi2::Domain::Event &domainObject);
+    // virtual void load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::Domain::Event &)> &resultCallback);
+    virtual void load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::Domain::Event::Ptr &)> &resultCallback);
+
+private:
+    QSharedPointer<ResourceAccess> mResourceAccess;
+    QSharedPointer<Database> mDatabase;
+};
diff --git a/dummyresource/syncronizer.cpp b/dummyresource/syncronizer.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dummyresource/syncronizer.cpp
diff --git a/store/database.cpp b/store/database.cpp
index c16a077..7e2019e 100644
--- a/store/database.cpp
+++ b/store/database.cpp
@@ -63,7 +63,7 @@ void Database::write(const std::string &sKey, const std::string &sValue, MDB_txn
     }
 }
 
-void Database::read(const std::string &sKey)
+void Database::read(const std::string &sKey, const std::function<void(const std::string)> &resultHandler)
 {
     int rc;
     MDB_txn *txn;
@@ -76,13 +76,26 @@ void Database::read(const std::string &sKey)
 
     rc = mdb_txn_begin(env, NULL, MDB_RDONLY, &txn);
     rc = mdb_cursor_open(txn, dbi, &cursor);
-    // while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
-    if ((rc = mdb_cursor_get(cursor, &key, &data, MDB_SET)) == 0) {
-        const std::string resultKey(static_cast<char*>(key.mv_data), key.mv_size);
-        const std::string resultValue(static_cast<char*>(data.mv_data), data.mv_size);
-        // std::cout << "key: " << resultKey << " data: " << resultValue << std::endl;
+    if (sKey.empty()) {
+        std::cout << "Iterating over all values of store!" << std::endl;
+        while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
+            const std::string resultKey(static_cast<char*>(key.mv_data), key.mv_size);
+            const std::string resultValue(static_cast<char*>(data.mv_data), data.mv_size);
+            // std::cout << "key: " << resultKey << " data: " << resultValue << std::endl;
+            resultHandler(resultValue);
+        }
     } else {
-        std::cout << "couldn't find value " << sKey << std::endl;
+        if ((rc = mdb_cursor_get(cursor, &key, &data, MDB_SET)) == 0) {
+            const std::string resultKey(static_cast<char*>(key.mv_data), key.mv_size);
+            const std::string resultValue(static_cast<char*>(data.mv_data), data.mv_size);
+            // std::cout << "key: " << resultKey << " data: " << resultValue << std::endl;
+            resultHandler(resultValue);
+        } else {
+            std::cout << "couldn't find value " << sKey << std::endl;
+        }
+    }
+    if (rc) {
+        std::cerr << "mdb_cursor_get: " << rc << mdb_strerror(rc) << std::endl;
     }
     mdb_cursor_close(cursor);
     mdb_txn_abort(txn);
diff --git a/store/database.h b/store/database.h
index 1a124be..999a89e 100644
--- a/store/database.h
+++ b/store/database.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <lmdb.h>
 #include <string>
 #include <QString>
@@ -9,7 +11,8 @@ public:
     MDB_txn *startTransaction();
     void endTransaction(MDB_txn *transaction);
     void write(const std::string &sKey, const std::string &sValue, MDB_txn *transaction);
-    void read(const std::string &sKey);
+    //Perhaps prefer iterators (assuming we need to be able to match multiple values
+    void read(const std::string &sKey, const std::function<void(const std::string)> &);
 
 private:
     MDB_env *env;