7 files changed, 184 insertions, 2 deletions

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 1b5d870..c9a8bba 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -60,10 +60,13 @@ ApplicationDomainType& ApplicationDomainType::operator=(const ApplicationDomainT
     return *this;
 }
 
-ApplicationDomainType::~ApplicationDomainType() {}
+ApplicationDomainType::~ApplicationDomainType()
+{
+}
 
 QVariant ApplicationDomainType::getProperty(const QByteArray &key) const
 {
+    Q_ASSERT(mAdaptor);
     if (!mAdaptor->availableProperties().contains(key)) {
         Warning() << "No such property available " << key;
     }
@@ -72,7 +75,9 @@ QVariant ApplicationDomainType::getProperty(const QByteArray &key) const
 
 void ApplicationDomainType::setProperty(const QByteArray &key, const QVariant &value)
 {
-    mChangeSet.insert(key, value); mAdaptor->setProperty(key, value);
+    Q_ASSERT(mAdaptor);
+    mChangeSet.insert(key, value);
+    mAdaptor->setProperty(key, value);
 }
 
 QByteArrayList ApplicationDomainType::changedProperties() const
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 5514d26..227ab4d 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -160,3 +160,7 @@ Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Event)
 Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Event::Ptr)
 Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Mail)
 Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Mail::Ptr)
+Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Folder)
+Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Folder::Ptr)
+Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::AkonadiResource)
+Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::AkonadiResource::Ptr)
diff --git a/common/domain/dummy.fbs b/common/domain/dummy.fbs
new file mode 100644
index 0000000..8816b09
--- /dev/null
+++ b/common/domain/dummy.fbs
@@ -0,0 +1,7 @@
+namespace Akonadi2.ApplicationDomain.Buffer;
+
+table Dummy {
+}
+
+root_type Dummy;
+file_identifier "AKFB";
diff --git a/common/domain/event.cpp b/common/domain/event.cpp
index 87e13bc..42c13e2 100644
--- a/common/domain/event.cpp
+++ b/common/domain/event.cpp
@@ -47,6 +47,7 @@ ResultSet TypeImplementation<Event>::queryIndexes(const Akonadi2::Query &query,
         });
         appliedFilters << "uid";
     }
+    Trace() << "Index lookup found " << keys.size() << " keys.";
     return ResultSet(keys);
 }
 
diff --git a/common/domain/folder.cpp b/common/domain/folder.cpp
new file mode 100644
index 0000000..989d2c4
--- /dev/null
+++ b/common/domain/folder.cpp
@@ -0,0 +1,100 @@
+/*
+ *   Copyright (C) 2015 Christian Mollekopf <chrigi_1@fastfolder.fm>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ */
+#include "folder.h"
+
+#include <QVector>
+#include <QByteArray>
+#include <QString>
+
+#include "../resultset.h"
+#include "../index.h"
+#include "../storage.h"
+#include "../log.h"
+#include "../propertymapper.h"
+#include "../query.h"
+#include "../definitions.h"
+
+#include "folder_generated.h"
+
+using namespace Akonadi2::ApplicationDomain;
+
+ResultSet TypeImplementation<Folder>::queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet<QByteArray> &appliedFilters, Akonadi2::Storage::Transaction &transaction)
+{
+    QVector<QByteArray> keys;
+    if (query.propertyFilter.contains("parent")) {
+        Index index("folder.index.parent", transaction);
+        auto lookupKey = query.propertyFilter.value("parent").toByteArray();
+        if (lookupKey.isEmpty()) {
+            lookupKey = "toplevel";
+        }
+        index.lookup(lookupKey, [&](const QByteArray &value) {
+            keys << value;
+        },
+        [](const Index::Error &error) {
+            Warning() << "Error in uid index: " <<  error.message;
+        });
+        appliedFilters << "parent";
+    }
+    Trace() << "Index lookup found " << keys.size() << " keys.";
+    return ResultSet(keys);
+}
+
+void TypeImplementation<Folder>::index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction)
+{
+    const auto parent = bufferAdaptor.getProperty("parent");
+    Trace() << "indexing " << identifier << " with parent " << parent.toByteArray();
+    if (parent.isValid()) {
+        Q_ASSERT(!parent.toByteArray().isEmpty());
+        Index("folder.index.parent", transaction).add(parent.toByteArray(), identifier);
+    } else {
+        Index("folder.index.parent", transaction).add("toplevel", identifier);
+    }
+}
+
+void TypeImplementation<Folder>::removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction)
+{
+    const auto parent = bufferAdaptor.getProperty("parent");
+    if (parent.isValid()) {
+        Index("folder.index.parent", transaction).remove(parent.toByteArray(), identifier);
+    } else {
+        Index("folder.index.parent", transaction).remove("toplevel", identifier);
+    }
+}
+
+QSharedPointer<ReadPropertyMapper<TypeImplementation<Folder>::Buffer> > TypeImplementation<Folder>::initializeReadPropertyMapper()
+{
+    auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer> >::create();
+    propertyMapper->addMapping<QString, Buffer>("parent", &Buffer::parent);
+    propertyMapper->addMapping<QString, Buffer>("name", &Buffer::name);
+    return propertyMapper;
+}
+
+QSharedPointer<WritePropertyMapper<TypeImplementation<Folder>::BufferBuilder> > TypeImplementation<Folder>::initializeWritePropertyMapper()
+{
+    auto propertyMapper = QSharedPointer<WritePropertyMapper<BufferBuilder> >::create();
+    propertyMapper->addMapping("parent", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
+        auto offset = variantToProperty<QString>(value, fbb);
+        return [offset](BufferBuilder &builder) { builder.add_parent(offset); };
+    });
+    propertyMapper->addMapping("name", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
+        auto offset = variantToProperty<QString>(value, fbb);
+        return [offset](BufferBuilder &builder) { builder.add_name(offset); };
+    });
+    return propertyMapper;
+}
diff --git a/common/domain/folder.fbs b/common/domain/folder.fbs
new file mode 100644
index 0000000..3476d58
--- /dev/null
+++ b/common/domain/folder.fbs
@@ -0,0 +1,9 @@
+namespace Akonadi2.ApplicationDomain.Buffer;
+
+table Folder {
+  name:string;
+  parent:string;
+}
+
+root_type Folder;
+file_identifier "AKFB";
diff --git a/common/domain/folder.h b/common/domain/folder.h
new file mode 100644
index 0000000..545836f
--- /dev/null
+++ b/common/domain/folder.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2015 Christian Mollekopf <chrigi_1@fastmail.fm>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ */
+#pragma once
+
+#include "applicationdomaintype.h"
+
+#include "storage.h"
+
+class ResultSet;
+class QByteArray;
+
+template<typename T>
+class ReadPropertyMapper;
+template<typename T>
+class WritePropertyMapper;
+
+namespace Akonadi2 {
+    class Query;
+
+namespace ApplicationDomain {
+    namespace Buffer {
+        struct Folder;
+        struct FolderBuilder;
+    }
+
+template<>
+class TypeImplementation<Akonadi2::ApplicationDomain::Folder> {
+public:
+    typedef Akonadi2::ApplicationDomain::Buffer::Folder Buffer;
+    typedef Akonadi2::ApplicationDomain::Buffer::FolderBuilder BufferBuilder;
+    static QSet<QByteArray> indexedProperties();
+    static ResultSet queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet<QByteArray> &appliedFilters, Akonadi2::Storage::Transaction &transaction);
+    static void index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction);
+    static void removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction);
+    static QSharedPointer<ReadPropertyMapper<Buffer> > initializeReadPropertyMapper();
+    static QSharedPointer<WritePropertyMapper<BufferBuilder> > initializeWritePropertyMapper();
+};
+
+}
+}