17 files changed, 382 insertions, 505 deletions
diff --git a/common/domain/addressbook.fbs b/common/domain/addressbook.fbs
new file mode 100644
index 0000000..c2bda2b
--- /dev/null
+++ b/common/domain/addressbook.fbs
@@ -0,0 +1,9 @@
+namespace Sink.ApplicationDomain.Buffer;
+table Addressbook {
+  name:string;
+  parent:string;
+}
+root_type Addressbook;
+file_identifier "AKFB";
diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index fd88570..44f5a75 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -65,6 +65,9 @@ int registerProperty() {
    return 0;
 }
+#define SINK_REGISTER_ENTITY(ENTITY) \
+    constexpr const char *ENTITY::name;
 #define SINK_REGISTER_PROPERTY(ENTITYTYPE, PROPERTY) \
    constexpr const char *ENTITYTYPE::PROPERTY::name; \
    static int foo##ENTITYTYPE##PROPERTY = registerProperty<ENTITYTYPE, ENTITYTYPE::PROPERTY>();
@@ -72,6 +75,10 @@ int registerProperty() {
 namespace Sink {
 namespace ApplicationDomain {
+constexpr const char *SinkResource::name;
+constexpr const char *SinkAccount::name;
+SINK_REGISTER_ENTITY(Mail);
 SINK_REGISTER_PROPERTY(Mail, Sender);
 SINK_REGISTER_PROPERTY(Mail, To);
 SINK_REGISTER_PROPERTY(Mail, Cc);
@@ -90,11 +97,28 @@ SINK_REGISTER_PROPERTY(Mail, MessageId);
 SINK_REGISTER_PROPERTY(Mail, ParentMessageId);
 SINK_REGISTER_PROPERTY(Mail, ThreadId);
+SINK_REGISTER_ENTITY(Folder);
 SINK_REGISTER_PROPERTY(Folder, Name);
 SINK_REGISTER_PROPERTY(Folder, Icon);
 SINK_REGISTER_PROPERTY(Folder, SpecialPurpose);
 SINK_REGISTER_PROPERTY(Folder, Enabled);
 SINK_REGISTER_PROPERTY(Folder, Parent);
+SINK_REGISTER_PROPERTY(Folder, Count);
+SINK_REGISTER_PROPERTY(Folder, FullContentAvailable);
+SINK_REGISTER_ENTITY(Contact);
+SINK_REGISTER_PROPERTY(Contact, Uid);
+SINK_REGISTER_PROPERTY(Contact, Fn);
+SINK_REGISTER_PROPERTY(Contact, Firstname);
+SINK_REGISTER_PROPERTY(Contact, Lastname);
+SINK_REGISTER_PROPERTY(Contact, Emails);
+SINK_REGISTER_PROPERTY(Contact, Vcard);
+SINK_REGISTER_PROPERTY(Contact, Addressbook);
+SINK_REGISTER_ENTITY(Addressbook);
+SINK_REGISTER_PROPERTY(Addressbook, Name);
+SINK_REGISTER_PROPERTY(Addressbook, Parent);
+SINK_REGISTER_PROPERTY(Addressbook, LastUpdated);
 static const int foo = [] {
    QMetaType::registerEqualsComparator<Reference>();
@@ -115,10 +139,8 @@ void copyBuffer(Sink::ApplicationDomain::BufferAdaptor &buffer, Sink::Applicatio
    for (const auto &property : propertiesToCopy) {
        const auto value = buffer.getProperty(property);
        if (copyBlobs && value.canConvert<BLOB>()) {
-            auto oldPath = value.value<BLOB>().value;
+            const auto oldPath = value.value<BLOB>().value;
-            //FIXME: This is neither pretty nor save if we have multiple modifications of the same property (the first modification will remove the file).
+            const auto newPath = Sink::temporaryFileLocation() + "/" + QUuid::createUuid().toString();
-            //At least if the modification fails the file will be removed once the entity is removed.
-            auto newPath = oldPath + "copy";
            QFile::copy(oldPath, newPath);
            memoryAdaptor.setProperty(property, QVariant::fromValue(BLOB{newPath}));
        } else if (pruneReferences && value.canConvert<Reference>()) {
@@ -364,52 +386,12 @@ SinkResource ImapResource::create(const QByteArray &account)
    return resource;
 }
-template<>
+SinkResource CardDavResource::create(const QByteArray &account)
-QByteArray getTypeName<Contact>()
-{
-    return "contact";
-}
-template<>
-QByteArray getTypeName<Event>()
-{
-    return "event";
-}
-template<>
-QByteArray getTypeName<Todo>()
-{
-    return "todo";
-}
-template<>
-QByteArray getTypeName<SinkResource>()
-{
-    return "resource";
-}
-template<>
-QByteArray getTypeName<SinkAccount>()
-{
-    return "account";
-}
-template<>
-QByteArray getTypeName<Identity>()
-{
-    return "identity";
-}
-template<>
-QByteArray getTypeName<Mail>()
 {
-    return "mail";
+    auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-}
+    resource.setResourceType("sink.dav");
+    resource.setAccount(account);
-template<>
+    return resource;
-QByteArray getTypeName<Folder>()
-{
-    return "folder";
 }
 QByteArrayList getTypeNames()
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index be04db9..e5aa46e 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -28,7 +28,8 @@
 #include <QUuid>
 #include "bufferadaptor.h"
-#define SINK_ENTITY(TYPE) \
+#define SINK_ENTITY(TYPE, LOWERCASENAME) \
+    static constexpr const char *name = #LOWERCASENAME; \
    typedef QSharedPointer<TYPE> Ptr; \
    using Entity::Entity; \
    TYPE() = default; \
@@ -92,6 +93,43 @@
 namespace Sink {
 namespace ApplicationDomain {
+enum SINK_EXPORT ErrorCode {
+    NoError = 0,
+    UnknownError,
+    NoServerError,
+    ConnectionError,
+    LoginError,
+    ConfigurationError,
+    TransmissionError,
+};
+enum SINK_EXPORT SuccessCode {
+    TransmissionSuccess
+};
+enum SINK_EXPORT SyncStatus {
+    NoSyncStatus,
+    SyncInProgress,
+    SyncError,
+    SyncSuccess
+};
+/**
+ * The status of an account or resource.
+ *
+ * It is set as follows:
+ * * By default the status is offline.
+ * * If a connection to the server could be established the status is Connected.
+ * * If an error occurred that keeps the resource from operating (so non transient), the resource enters the error state.
+ * * If a long running operation is started the resource goes to the busy state (and return to the previous state after that).
+ */
+enum SINK_EXPORT Status {
+    OfflineStatus,
+    ConnectedStatus,
+    BusyStatus,
+    ErrorStatus
+};
 struct SINK_EXPORT Error {
 };
@@ -100,6 +138,11 @@ struct SINK_EXPORT Progress {
 };
+/**
+ * Internal type.
+ *
+ * Represents a BLOB property.
+ */
 struct BLOB {
    BLOB() = default;
    BLOB(const BLOB &) = default;
@@ -268,6 +311,7 @@ SINK_EXPORT QDebug operator<< (QDebug d, const BLOB &blob);
 struct SINK_EXPORT SinkAccount : public ApplicationDomainType {
+    static constexpr const char *name = "account";
    typedef QSharedPointer<SinkAccount> Ptr;
    explicit SinkAccount(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor);
    explicit SinkAccount(const QByteArray &identifier);
@@ -278,8 +322,6 @@ struct SINK_EXPORT SinkAccount : public ApplicationDomainType {
    SINK_PROPERTY(QString, Icon, icon);
    SINK_PROPERTY(QString, AccountType, type);
    SINK_STATUS_PROPERTY(int, Status, status);
-    SINK_STATUS_PROPERTY(ApplicationDomain::Error, Error, error);
-    SINK_STATUS_PROPERTY(ApplicationDomain::Progress, Progress, progress);
 };
@@ -290,6 +332,7 @@ struct SINK_EXPORT SinkAccount : public ApplicationDomainType {
 * and for creating and removing resource instances.
 */
 struct SINK_EXPORT SinkResource : public ApplicationDomainType {
+    static constexpr const char *name = "resource";
    typedef QSharedPointer<SinkResource> Ptr;
    explicit SinkResource(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor);
    explicit SinkResource(const QByteArray &identifier);
@@ -300,8 +343,6 @@ struct SINK_EXPORT SinkResource : public ApplicationDomainType {
    SINK_PROPERTY(QByteArray, ResourceType, type);
    SINK_PROPERTY(QByteArrayList, Capabilities, capabilities);
    SINK_STATUS_PROPERTY(int, Status, status);
-    SINK_STATUS_PROPERTY(ApplicationDomain::Error, Error, error);
-    SINK_STATUS_PROPERTY(ApplicationDomain::Progress, Progress, progress);
 };
 struct SINK_EXPORT Entity : public ApplicationDomainType {
@@ -312,16 +353,35 @@ struct SINK_EXPORT Entity : public ApplicationDomainType {
    virtual ~Entity() = default;
 };
+struct SINK_EXPORT Addressbook : public Entity {
+    SINK_ENTITY(Addressbook, addressbook);
+    SINK_REFERENCE_PROPERTY(Addressbook, Parent, parent);
+    SINK_PROPERTY(QString, Name, name);
+    SINK_EXTRACTED_PROPERTY(QDateTime, LastUpdated, lastUpdated);
+};
 struct SINK_EXPORT Contact : public Entity {
-    SINK_ENTITY(Contact);
+    struct SINK_EXPORT Email {
+        enum Type {
+            Undefined,
+            Work,
+            Home
+        };
+        Type type;
+        QString email;
+    };
+    SINK_ENTITY(Contact, contact);
    SINK_PROPERTY(QString, Uid, uid);
    SINK_PROPERTY(QString, Fn, fn);
-    SINK_PROPERTY(QByteArrayList, Emails, emails);
+    SINK_PROPERTY(QString, Firstname, firstname);
+    SINK_PROPERTY(QString, Lastname, lastname);
+    SINK_PROPERTY(QList<Email>, Emails, emails);
    SINK_PROPERTY(QByteArray, Vcard, vcard);
+    SINK_REFERENCE_PROPERTY(Addressbook, Addressbook, addressbook);
 };
 struct SINK_EXPORT Event : public Entity {
-    SINK_ENTITY(Event);
+    SINK_ENTITY(Event, event);
    SINK_PROPERTY(QString, Uid, uid);
    SINK_PROPERTY(QString, Summary, summary);
    SINK_PROPERTY(QString, Description, description);
@@ -329,20 +389,23 @@ struct SINK_EXPORT Event : public Entity {
 };
 struct SINK_EXPORT Todo : public Entity {
-    SINK_ENTITY(Todo);
+    SINK_ENTITY(Todo, todo);
 };
 struct SINK_EXPORT Calendar : public Entity {
-    SINK_ENTITY(Calendar);
+    SINK_ENTITY(Calendar, calendar);
 };
 struct SINK_EXPORT Folder : public Entity {
-    SINK_ENTITY(Folder);
+    SINK_ENTITY(Folder, folder);
    SINK_REFERENCE_PROPERTY(Folder, Parent, parent);
    SINK_PROPERTY(QString, Name, name);
    SINK_PROPERTY(QByteArray, Icon, icon);
    SINK_PROPERTY(QByteArrayList, SpecialPurpose, specialpurpose);
    SINK_PROPERTY(bool, Enabled, enabled);
+    SINK_EXTRACTED_PROPERTY(QDateTime, LastUpdated, lastUpdated);
+    SINK_EXTRACTED_PROPERTY(int, Count, count);
+    SINK_EXTRACTED_PROPERTY(bool, FullContentAvailable, fullContentAvailable);
 };
 struct SINK_EXPORT Mail : public Entity {
@@ -351,7 +414,7 @@ struct SINK_EXPORT Mail : public Entity {
        QString emailAddress;
    };
-    SINK_ENTITY(Mail);
+    SINK_ENTITY(Mail, mail);
    SINK_EXTRACTED_PROPERTY(Contact, Sender, sender);
    SINK_EXTRACTED_PROPERTY(QList<Contact>, To, to);
    SINK_EXTRACTED_PROPERTY(QList<Contact>, Cc, cc);
@@ -373,23 +436,8 @@ struct SINK_EXPORT Mail : public Entity {
 SINK_EXPORT QDebug operator<< (QDebug d, const Mail::Contact &c);
-/**
- * The status of an account or resource.
- *
- * It is set as follows:
- * * By default the status is offline.
- * * If a connection to the server could be established the status is Connected.
- * * If an error occurred that keeps the resource from operating (so non transient), the resource enters the error state.
- * * If a long running operation is started the resource goes to the busy state (and return to the previous state after that).
- */
-enum SINK_EXPORT Status {
-    OfflineStatus,
-    ConnectedStatus,
-    BusyStatus,
-    ErrorStatus
-};
 struct SINK_EXPORT Identity : public ApplicationDomainType {
+    static constexpr const char *name = "identity";
    typedef QSharedPointer<Identity> Ptr;
    explicit Identity(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor);
    explicit Identity(const QByteArray &identifier);
@@ -416,6 +464,10 @@ struct SINK_EXPORT ImapResource {
    static SinkResource create(const QByteArray &account);
 };
+struct SINK_EXPORT CardDavResource {
+    static SinkResource create(const QByteArray &account);
+};
 namespace ResourceCapabilities {
 namespace Mail {
    static constexpr const char *mail = "mail";
@@ -427,6 +479,11 @@ namespace Mail {
    static constexpr const char *transport = "mail.transport";
    static constexpr const char *folderhierarchy = "mail.folderhierarchy";
 };
+namespace Contact {
+    static constexpr const char *contact = "contact";
+    static constexpr const char *addressbook = "addressbook";
+    static constexpr const char *storage = "contact.storage";
+};
 };
 namespace SpecialPurpose {
@@ -444,31 +501,10 @@ namespace Mail {
 * Do not store these types to disk, they may change over time.
 */
 template<class DomainType>
-QByteArray SINK_EXPORT getTypeName();
+QByteArray SINK_EXPORT getTypeName()
+{
-template<>
+    return DomainType::name;
-QByteArray SINK_EXPORT getTypeName<Contact>();
+}
-template<>
-QByteArray SINK_EXPORT getTypeName<Event>();
-template<>
-QByteArray SINK_EXPORT getTypeName<Todo>();
-template<>
-QByteArray SINK_EXPORT getTypeName<SinkResource>();
-template<>
-QByteArray SINK_EXPORT getTypeName<SinkAccount>();
-template<>
-QByteArray SINK_EXPORT getTypeName<Identity>();
-template<>
-QByteArray SINK_EXPORT getTypeName<Mail>();
-template<>
-QByteArray SINK_EXPORT getTypeName<Folder>();
 QByteArrayList SINK_EXPORT getTypeNames();
@@ -499,6 +535,7 @@ class SINK_EXPORT TypeImplementation;
 */
 #define SINK_REGISTER_TYPES() \
    REGISTER_TYPE(Sink::ApplicationDomain::Contact) \
+    REGISTER_TYPE(Sink::ApplicationDomain::Addressbook) \
    REGISTER_TYPE(Sink::ApplicationDomain::Event) \
    REGISTER_TYPE(Sink::ApplicationDomain::Mail) \
    REGISTER_TYPE(Sink::ApplicationDomain::Folder) \
@@ -520,6 +557,7 @@ Q_DECLARE_METATYPE(Sink::ApplicationDomain::ApplicationDomainType::Ptr)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Entity)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Entity::Ptr)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Mail::Contact)
+Q_DECLARE_METATYPE(Sink::ApplicationDomain::Contact::Email)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Error)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Progress)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::BLOB)
diff --git a/common/domain/applicationdomaintype_p.h b/common/domain/applicationdomaintype_p.h
index 4b06864..a5a6b1d 100644
--- a/common/domain/applicationdomaintype_p.h
+++ b/common/domain/applicationdomaintype_p.h
@@ -33,13 +33,15 @@ struct TypeHelper {
    template <typename R, typename ...Args>
    R operator()(Args && ... args) const {
        if (type == Sink::ApplicationDomain::getTypeName<Sink::ApplicationDomain::Folder>()) {
-            return Func<Sink::ApplicationDomain::Folder>{}(std::forward<Args...>(args...)); 
+            return Func<Sink::ApplicationDomain::Folder>{}(std::forward<Args...>(args...));
        } else if (type == Sink::ApplicationDomain::getTypeName<Sink::ApplicationDomain::Mail>()) {
-            return Func<Sink::ApplicationDomain::Mail>{}(std::forward<Args...>(args...)); 
+            return Func<Sink::ApplicationDomain::Mail>{}(std::forward<Args...>(args...));
        } else if (type == Sink::ApplicationDomain::getTypeName<Sink::ApplicationDomain::Event>()) {
-            return Func<Sink::ApplicationDomain::Event>{}(std::forward<Args...>(args...)); 
+            return Func<Sink::ApplicationDomain::Event>{}(std::forward<Args...>(args...));
        } else if (type == Sink::ApplicationDomain::getTypeName<Sink::ApplicationDomain::Contact>()) {
            return Func<Sink::ApplicationDomain::Contact>{}(std::forward<Args...>(args...));
+        } else if (type == Sink::ApplicationDomain::getTypeName<Sink::ApplicationDomain::Addressbook>()) {
+            return Func<Sink::ApplicationDomain::Addressbook>{}(std::forward<Args...>(args...));
        } else {
            Q_ASSERT(false);
        }
diff --git a/common/domain/contact.cpp b/common/domain/contact.cpp
deleted file mode 100644
index ea7cac2..0000000
--- a/common/domain/contact.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2017 Sandro Knauß <knauss@kolabsys.com>
- *
- *   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 "contact.h"
-#include <QVector>
-#include <QByteArray>
-#include <QString>
-#include "../propertymapper.h"
-#include "../typeindex.h"
-#include "entity_generated.h"
-#include "contact_generated.h"
-using namespace Sink::ApplicationDomain;
-void TypeImplementation<Contact>::configure(TypeIndex &index)
-{
-    index.addProperty<QByteArray>(Contact::Uid::name);
-}
-void TypeImplementation<Contact>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
-{
-    propertyMapper.addMapping<Contact::Uid, Buffer>(&Buffer::uid);
-    propertyMapper.addMapping<Contact::Fn, Buffer>(&Buffer::fn);
-    propertyMapper.addMapping<Contact::Emails, Buffer>(&Buffer::emails);
-    propertyMapper.addMapping<Contact::Vcard, Buffer>(&Buffer::vcard);
-}
-void TypeImplementation<Contact>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
-{
-    propertyMapper.addMapping<Contact::Uid>(&BufferBuilder::add_uid);
-    propertyMapper.addMapping<Contact::Fn>(&BufferBuilder::add_fn);
-    propertyMapper.addMapping<Contact::Emails>(&BufferBuilder::add_emails);
-    propertyMapper.addMapping<Contact::Vcard>(&BufferBuilder::add_vcard);
-}
-void TypeImplementation<Contact>::configure(IndexPropertyMapper &)
-{
-}
diff --git a/common/domain/contact.fbs b/common/domain/contact.fbs
index 34fb1d6..d941d5a 100644
--- a/common/domain/contact.fbs
+++ b/common/domain/contact.fbs
@@ -1,9 +1,17 @@
 namespace Sink.ApplicationDomain.Buffer;
+table ContactEmail {
+    type: int;
+    email: string;
+}
 table Contact {
  uid:string;
  fn:string;
-  emails: [string];
+  firstname:string;
+  lastname:string;
+  addressbook:string;
+  emails: [ContactEmail];
  vcard: string;
 }
diff --git a/common/domain/contact.h b/common/domain/contact.h
deleted file mode 100644
index c803a9f..0000000
--- a/common/domain/contact.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2017 Sandro Knauß <knauss@kolabsys.com>
- *
- *   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"
-class QByteArray;
-template<typename T>
-class ReadPropertyMapper;
-template<typename T>
-class WritePropertyMapper;
-class IndexPropertyMapper;
-class TypeIndex;
-namespace Sink {
-namespace ApplicationDomain {
-    namespace Buffer {
-        struct Contact;
-        struct ContactBuilder;
-    }
-/**
- * Implements all type-specific code such as updating and querying indexes.
- * 
- * These are type specifiy default implementations. Theoretically a resource could implement it's own implementation.
- */
-template<>
-class TypeImplementation<Sink::ApplicationDomain::Contact> {
-public:
-    typedef Sink::ApplicationDomain::Buffer::Contact Buffer;
-    typedef Sink::ApplicationDomain::Buffer::ContactBuilder BufferBuilder;
-    static void configure(TypeIndex &);
-    static void configure(ReadPropertyMapper<Buffer> &);
-    static void configure(WritePropertyMapper<BufferBuilder> &);
-    static void configure(IndexPropertyMapper &indexPropertyMapper);
-};
-}
-}
diff --git a/common/domain/domaintypes.h b/common/domain/domaintypes.h
deleted file mode 100644
index 0abdee7..0000000
--- a/common/domain/domaintypes.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "contact.h"
-#include "mail.h"
-#include "folder.h"
-#include "event.h"
diff --git a/common/domain/event.cpp b/common/domain/event.cpp
deleted file mode 100644
index 10c92bb..0000000
--- a/common/domain/event.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-#include "event.h"
-#include <QVector>
-#include <QByteArray>
-#include <QString>
-#include "../propertymapper.h"
-#include "../typeindex.h"
-#include "entity_generated.h"
-#include "event_generated.h"
-using namespace Sink::ApplicationDomain;
-void TypeImplementation<Event>::configure(TypeIndex &index)
-{
-    index.addProperty<QByteArray>(Event::Uid::name);
-}
-void TypeImplementation<Event>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
-{
-    propertyMapper.addMapping<Event::Summary, Buffer>(&Buffer::summary);
-    propertyMapper.addMapping<Event::Description, Buffer>(&Buffer::description);
-    propertyMapper.addMapping<Event::Uid, Buffer>(&Buffer::uid);
-    propertyMapper.addMapping<Event::Attachment, Buffer>(&Buffer::attachment);
-}
-void TypeImplementation<Event>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
-{
-    propertyMapper.addMapping<Event::Summary>(&BufferBuilder::add_summary);
-    propertyMapper.addMapping<Event::Description>(&BufferBuilder::add_description);
-    propertyMapper.addMapping<Event::Uid>(&BufferBuilder::add_uid);
-    propertyMapper.addMapping<Event::Attachment>(&BufferBuilder::add_attachment);
-}
-void TypeImplementation<Event>::configure(IndexPropertyMapper &)
-{
-}
diff --git a/common/domain/event.h b/common/domain/event.h
deleted file mode 100644
index b683f5f..0000000
--- a/common/domain/event.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2014 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"
-class QByteArray;
-template<typename T>
-class ReadPropertyMapper;
-template<typename T>
-class WritePropertyMapper;
-class IndexPropertyMapper;
-class TypeIndex;
-namespace Sink {
-namespace ApplicationDomain {
-    namespace Buffer {
-        struct Event;
-        struct EventBuilder;
-    }
-/**
- * Implements all type-specific code such as updating and querying indexes.
- * 
- * These are type specifiy default implementations. Theoretically a resource could implement it's own implementation.
- */
-template<>
-class TypeImplementation<Sink::ApplicationDomain::Event> {
-public:
-    typedef Sink::ApplicationDomain::Buffer::Event Buffer;
-    typedef Sink::ApplicationDomain::Buffer::EventBuilder BufferBuilder;
-    static void configure(TypeIndex &);
-    static void configure(ReadPropertyMapper<Buffer> &);
-    static void configure(WritePropertyMapper<BufferBuilder> &);
-    static void configure(IndexPropertyMapper &indexPropertyMapper);
-};
-}
-}
diff --git a/common/domain/folder.cpp b/common/domain/folder.cpp
deleted file mode 100644
index 6717661..0000000
--- a/common/domain/folder.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *   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 <QByteArray>
-#include <QString>
-#include "../propertymapper.h"
-#include "../typeindex.h"
-#include "entitybuffer.h"
-#include "entity_generated.h"
-#include "folder_generated.h"
-using namespace Sink::ApplicationDomain;
-void TypeImplementation<Folder>::configure(TypeIndex &index)
-{
-    index.addProperty<QByteArray>(Folder::Parent::name);
-    index.addProperty<QString>(Folder::Name::name);
-}
-void TypeImplementation<Folder>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
-{
-    propertyMapper.addMapping<Folder::Parent, Buffer>(&Buffer::parent);
-    propertyMapper.addMapping<Folder::Name, Buffer>(&Buffer::name);
-    propertyMapper.addMapping<Folder::Icon, Buffer>(&Buffer::icon);
-    propertyMapper.addMapping<Folder::SpecialPurpose, Buffer>(&Buffer::specialpurpose);
-    propertyMapper.addMapping<Folder::Enabled, Buffer>(&Buffer::enabled);
-}
-void TypeImplementation<Folder>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
-{
-    propertyMapper.addMapping<Folder::Parent>(&BufferBuilder::add_parent);
-    propertyMapper.addMapping<Folder::Name>(&BufferBuilder::add_name);
-    propertyMapper.addMapping<Folder::Icon>(&BufferBuilder::add_icon);
-    propertyMapper.addMapping<Folder::SpecialPurpose>(&BufferBuilder::add_specialpurpose);
-    propertyMapper.addMapping<Folder::Enabled>(&BufferBuilder::add_enabled);
-}
-void TypeImplementation<Folder>::configure(IndexPropertyMapper &)
-{
-}
diff --git a/common/domain/folder.h b/common/domain/folder.h
deleted file mode 100644
index f232ab5..0000000
--- a/common/domain/folder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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"
-template<typename T>
-class ReadPropertyMapper;
-template<typename T>
-class WritePropertyMapper;
-class IndexPropertyMapper;
-class TypeIndex;
-namespace Sink {
-namespace ApplicationDomain {
-    namespace Buffer {
-        struct Folder;
-        struct FolderBuilder;
-    }
-template<>
-class TypeImplementation<Sink::ApplicationDomain::Folder> {
-public:
-    typedef Sink::ApplicationDomain::Buffer::Folder Buffer;
-    typedef Sink::ApplicationDomain::Buffer::FolderBuilder BufferBuilder;
-    static void configure(TypeIndex &);
-    static void configure(ReadPropertyMapper<Buffer> &);
-    static void configure(WritePropertyMapper<BufferBuilder> &);
-    static void configure(IndexPropertyMapper &indexPropertyMapper);
-};
-}
-}
diff --git a/common/domain/mail.h b/common/domain/mail.h
deleted file mode 100644
index e052448..0000000
--- a/common/domain/mail.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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"
-class QByteArray;
-template<typename T>
-class ReadPropertyMapper;
-template<typename T>
-class WritePropertyMapper;
-class IndexPropertyMapper;
-class TypeIndex;
-namespace Sink {
-namespace ApplicationDomain {
-    namespace Buffer {
-        struct Mail;
-        struct MailBuilder;
-    }
-template<>
-class TypeImplementation<Sink::ApplicationDomain::Mail> {
-public:
-    typedef Sink::ApplicationDomain::Buffer::Mail Buffer;
-    typedef Sink::ApplicationDomain::Buffer::MailBuilder BufferBuilder;
-    static void configure(TypeIndex &index);
-    static void configure(ReadPropertyMapper<Buffer> &propertyMapper);
-    static void configure(WritePropertyMapper<BufferBuilder> &propertyMapper);
-    static void configure(IndexPropertyMapper &indexPropertyMapper);
-};
-}
-}
diff --git a/common/domain/propertyregistry.cpp b/common/domain/propertyregistry.cpp
index 2208193..7b9b61a 100644
--- a/common/domain/propertyregistry.cpp
+++ b/common/domain/propertyregistry.cpp
@@ -64,6 +64,17 @@ QVariant parseString<bool>(const QString &s)
 }
 template <>
+QVariant parseString<int>(const QString &s)
+{
+    bool ok = false;
+    auto n = s.toInt(&ok);
+    if (ok) {
+        return QVariant::fromValue(n);
+    }
+    return {};
+}
+template <>
 QVariant parseString<QList<QByteArray>>(const QString &s)
 {
    auto list = s.split(',');
@@ -92,6 +103,13 @@ QVariant parseString<QList<Sink::ApplicationDomain::Mail::Contact>>(const QStrin
    return QVariant{};
 }
+template <>
+QVariant parseString<QList<Sink::ApplicationDomain::Contact::Email>>(const QString &s)
+{
+    Q_ASSERT(false);
+    return QVariant{};
+}
 PropertyRegistry &PropertyRegistry::instance()
 {
    static PropertyRegistry instance;
diff --git a/common/domain/propertyregistry.h b/common/domain/propertyregistry.h
index 16df23b..758c10d 100644
--- a/common/domain/propertyregistry.h
+++ b/common/domain/propertyregistry.h
@@ -49,6 +49,9 @@ template <>
 QVariant parseString<bool>(const QString &s);
 template <>
+QVariant parseString<int>(const QString &s);
+template <>
 QVariant parseString<QList<QByteArray>>(const QString &s);
 template <>
diff --git a/common/domain/mail.cpp b/common/domain/typeimplementations.cpp
index 8cbe61b..eb3851e 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/typeimplementations.cpp
@@ -16,7 +16,7 @@
 *   Free Software Foundation, Inc.,
 *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
 */
-#include "mail.h"
+#include "typeimplementations.h"
 #include <QVector>
 #include <QByteArray>
@@ -29,8 +29,6 @@
 #include "mail/threadindexer.h"
 #include "domainadaptor.h"
-#include "mail_generated.h"
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
@@ -102,3 +100,117 @@ void TypeImplementation<Mail>::configure(WritePropertyMapper<BufferBuilder> &pro
    propertyMapper.addMapping<Mail::MessageId>(&BufferBuilder::add_messageId);
    propertyMapper.addMapping<Mail::ParentMessageId>(&BufferBuilder::add_parentMessageId);
 }
+void TypeImplementation<Folder>::configure(TypeIndex &index)
+{
+    index.addProperty<QByteArray>(Folder::Parent::name);
+    index.addProperty<QString>(Folder::Name::name);
+}
+void TypeImplementation<Folder>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
+{
+    propertyMapper.addMapping<Folder::Parent, Buffer>(&Buffer::parent);
+    propertyMapper.addMapping<Folder::Name, Buffer>(&Buffer::name);
+    propertyMapper.addMapping<Folder::Icon, Buffer>(&Buffer::icon);
+    propertyMapper.addMapping<Folder::SpecialPurpose, Buffer>(&Buffer::specialpurpose);
+    propertyMapper.addMapping<Folder::Enabled, Buffer>(&Buffer::enabled);
+}
+void TypeImplementation<Folder>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+{
+    propertyMapper.addMapping<Folder::Parent>(&BufferBuilder::add_parent);
+    propertyMapper.addMapping<Folder::Name>(&BufferBuilder::add_name);
+    propertyMapper.addMapping<Folder::Icon>(&BufferBuilder::add_icon);
+    propertyMapper.addMapping<Folder::SpecialPurpose>(&BufferBuilder::add_specialpurpose);
+    propertyMapper.addMapping<Folder::Enabled>(&BufferBuilder::add_enabled);
+}
+void TypeImplementation<Folder>::configure(IndexPropertyMapper &)
+{
+}
+void TypeImplementation<Contact>::configure(TypeIndex &index)
+{
+    index.addProperty<QByteArray>(Contact::Uid::name);
+}
+void TypeImplementation<Contact>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
+{
+    propertyMapper.addMapping<Contact::Uid, Buffer>(&Buffer::uid);
+    propertyMapper.addMapping<Contact::Fn, Buffer>(&Buffer::fn);
+    propertyMapper.addMapping<Contact::Emails, Buffer>(&Buffer::emails);
+    propertyMapper.addMapping<Contact::Vcard, Buffer>(&Buffer::vcard);
+    propertyMapper.addMapping<Contact::Addressbook, Buffer>(&Buffer::addressbook);
+    propertyMapper.addMapping<Contact::Firstname, Buffer>(&Buffer::firstname);
+    propertyMapper.addMapping<Contact::Lastname, Buffer>(&Buffer::lastname);
+}
+void TypeImplementation<Contact>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+{
+    propertyMapper.addMapping<Contact::Uid>(&BufferBuilder::add_uid);
+    propertyMapper.addMapping<Contact::Fn>(&BufferBuilder::add_fn);
+    propertyMapper.addMapping<Contact::Emails>(&BufferBuilder::add_emails);
+    propertyMapper.addMapping<Contact::Vcard>(&BufferBuilder::add_vcard);
+    propertyMapper.addMapping<Contact::Addressbook>(&BufferBuilder::add_addressbook);
+    propertyMapper.addMapping<Contact::Firstname>(&BufferBuilder::add_firstname);
+    propertyMapper.addMapping<Contact::Lastname>(&BufferBuilder::add_lastname);
+}
+void TypeImplementation<Contact>::configure(IndexPropertyMapper &)
+{
+}
+void TypeImplementation<Addressbook>::configure(TypeIndex &index)
+{
+    index.addProperty<QByteArray>(Addressbook::Parent::name);
+    index.addProperty<QString>(Addressbook::Name::name);
+}
+void TypeImplementation<Addressbook>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
+{
+    propertyMapper.addMapping<Addressbook::Parent, Buffer>(&Buffer::parent);
+    propertyMapper.addMapping<Addressbook::Name, Buffer>(&Buffer::name);
+}
+void TypeImplementation<Addressbook>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+{
+    propertyMapper.addMapping<Addressbook::Parent>(&BufferBuilder::add_parent);
+    propertyMapper.addMapping<Addressbook::Name>(&BufferBuilder::add_name);
+}
+void TypeImplementation<Addressbook>::configure(IndexPropertyMapper &)
+{
+}
+void TypeImplementation<Event>::configure(TypeIndex &index)
+{
+    index.addProperty<QByteArray>(Event::Uid::name);
+}
+void TypeImplementation<Event>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
+{
+    propertyMapper.addMapping<Event::Summary, Buffer>(&Buffer::summary);
+    propertyMapper.addMapping<Event::Description, Buffer>(&Buffer::description);
+    propertyMapper.addMapping<Event::Uid, Buffer>(&Buffer::uid);
+    propertyMapper.addMapping<Event::Attachment, Buffer>(&Buffer::attachment);
+}
+void TypeImplementation<Event>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+{
+    propertyMapper.addMapping<Event::Summary>(&BufferBuilder::add_summary);
+    propertyMapper.addMapping<Event::Description>(&BufferBuilder::add_description);
+    propertyMapper.addMapping<Event::Uid>(&BufferBuilder::add_uid);
+    propertyMapper.addMapping<Event::Attachment>(&BufferBuilder::add_attachment);
+}
+void TypeImplementation<Event>::configure(IndexPropertyMapper &)
+{
+}
diff --git a/common/domain/typeimplementations.h b/common/domain/typeimplementations.h
new file mode 100644
index 0000000..37d6ca9
--- /dev/null
+++ b/common/domain/typeimplementations.h
@@ -0,0 +1,101 @@
+/*
+ *   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 "mail_generated.h"
+#include "folder_generated.h"
+#include "event_generated.h"
+#include "contact_generated.h"
+#include "addressbook_generated.h"
+template<typename T>
+class ReadPropertyMapper;
+template<typename T>
+class WritePropertyMapper;
+class IndexPropertyMapper;
+class TypeIndex;
+/**
+ * Implements all type-specific code such as updating and querying indexes.
+ *
+ * These are type specifiy default implementations. Theoretically a resource could implement it's own implementation.
+ */
+namespace Sink {
+namespace ApplicationDomain {
+template<>
+class TypeImplementation<Sink::ApplicationDomain::Mail> {
+public:
+    typedef Sink::ApplicationDomain::Buffer::Mail Buffer;
+    typedef Sink::ApplicationDomain::Buffer::MailBuilder BufferBuilder;
+    static void configure(TypeIndex &index);
+    static void configure(ReadPropertyMapper<Buffer> &propertyMapper);
+    static void configure(WritePropertyMapper<BufferBuilder> &propertyMapper);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
+};
+template<>
+class TypeImplementation<Sink::ApplicationDomain::Folder> {
+public:
+    typedef Sink::ApplicationDomain::Buffer::Folder Buffer;
+    typedef Sink::ApplicationDomain::Buffer::FolderBuilder BufferBuilder;
+    static void configure(TypeIndex &);
+    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
+};
+template<>
+class TypeImplementation<Sink::ApplicationDomain::Contact> {
+public:
+    typedef Sink::ApplicationDomain::Buffer::Contact Buffer;
+    typedef Sink::ApplicationDomain::Buffer::ContactBuilder BufferBuilder;
+    static void configure(TypeIndex &);
+    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
+};
+template<>
+class TypeImplementation<Sink::ApplicationDomain::Addressbook> {
+public:
+    typedef Sink::ApplicationDomain::Buffer::Addressbook Buffer;
+    typedef Sink::ApplicationDomain::Buffer::AddressbookBuilder BufferBuilder;
+    static void configure(TypeIndex &);
+    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
+};
+template<>
+class TypeImplementation<Sink::ApplicationDomain::Event> {
+public:
+    typedef Sink::ApplicationDomain::Buffer::Event Buffer;
+    typedef Sink::ApplicationDomain::Buffer::EventBuilder BufferBuilder;
+    static void configure(TypeIndex &);
+    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
+};
+}
+}