Addressbook support

10 files changed, 154 insertions, 5 deletions

diff --git a/common/domain/addressbook.cpp b/common/domain/addressbook.cpp
new file mode 100644
index 0000000..d1a3eaf
--- /dev/null
+++ b/common/domain/addressbook.cpp
@@ -0,0 +1,54 @@
+/*
+ *   Copyright (C) 2017 Christian Mollekopf <chrigi_1@fastaddressbook.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 "addressbook.h"
+
+#include <QByteArray>
+#include <QString>
+
+#include "../propertymapper.h"
+#include "../typeindex.h"
+#include "entitybuffer.h"
+#include "entity_generated.h"
+
+#include "addressbook_generated.h"
+
+using namespace Sink::ApplicationDomain;
+
+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 &)
+{
+
+}
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/addressbook.h b/common/domain/addressbook.h
new file mode 100644
index 0000000..6475073
--- /dev/null
+++ b/common/domain/addressbook.h
@@ -0,0 +1,51 @@
+/*
+ *   Copyright (C) 2017 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 Addressbook;
+        struct AddressbookBuilder;
+    }
+
+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);
+};
+
+}
+}
diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 99f14a1..1efe052 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -96,6 +96,15 @@ SINK_REGISTER_PROPERTY(Folder, SpecialPurpose);
 SINK_REGISTER_PROPERTY(Folder, Enabled);
 SINK_REGISTER_PROPERTY(Folder, Parent);
 
+SINK_REGISTER_PROPERTY(Contact, Uid);
+SINK_REGISTER_PROPERTY(Contact, Fn);
+SINK_REGISTER_PROPERTY(Contact, Emails);
+SINK_REGISTER_PROPERTY(Contact, Vcard);
+SINK_REGISTER_PROPERTY(Contact, Addressbook);
+
+SINK_REGISTER_PROPERTY(Addressbook, Name);
+SINK_REGISTER_PROPERTY(Addressbook, Parent);
+
 static const int foo = [] {
     QMetaType::registerEqualsComparator<Reference>();
     QMetaType::registerDebugStreamOperator<Reference>();
@@ -369,6 +378,12 @@ QByteArray getTypeName<Contact>()
 }
 
 template<>
+QByteArray getTypeName<Addressbook>()
+{
+    return "addressbook";
+}
+
+template<>
 QByteArray getTypeName<Event>()
 {
     return "event";
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 3afef75..209f241 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -312,12 +312,19 @@ struct SINK_EXPORT Entity : public ApplicationDomainType {
     virtual ~Entity() = default;
 };
 
+struct SINK_EXPORT Addressbook : public Entity {
+    SINK_ENTITY(Addressbook);
+    SINK_REFERENCE_PROPERTY(Addressbook, Parent, parent);
+    SINK_PROPERTY(QString, Name, name);
+};
+
 struct SINK_EXPORT Contact : public Entity {
     SINK_ENTITY(Contact);
     SINK_PROPERTY(QString, Uid, uid);
     SINK_PROPERTY(QString, Fn, fn);
     SINK_PROPERTY(QByteArrayList, Emails, emails);
     SINK_PROPERTY(QByteArray, Vcard, vcard);
+    SINK_REFERENCE_PROPERTY(Addressbook, Addressbook, addressbook);
 };
 
 struct SINK_EXPORT Event : public Entity {
@@ -429,6 +436,7 @@ namespace Mail {
 };
 namespace Contact {
     static constexpr const char *contact = "contact";
+    static constexpr const char *addressbook = "addressbook";
     static constexpr const char *storage = "contact.storage";
 };
 };
@@ -454,6 +462,9 @@ template<>
 QByteArray SINK_EXPORT getTypeName<Contact>();
 
 template<>
+QByteArray SINK_EXPORT getTypeName<Addressbook>();
+
+template<>
 QByteArray SINK_EXPORT getTypeName<Event>();
 
 template<>
@@ -503,6 +514,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) \
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
index ea7cac2..01f9144 100644
--- a/common/domain/contact.cpp
+++ b/common/domain/contact.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2017 Sandro Knauß <knauss@kolabsys.com>
+ *   Copyright (C) 2017 Sandro Knauß <knauss@kolabsys.com>
+ *   Copyright (C) 2017 Christian Mollekopf <mollekopf@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
@@ -41,6 +42,7 @@ void TypeImplementation<Contact>::configure(ReadPropertyMapper<Buffer> &property
     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);
 }
 
 void TypeImplementation<Contact>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
@@ -49,6 +51,7 @@ void TypeImplementation<Contact>::configure(WritePropertyMapper<BufferBuilder> &
     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);
 }
 
 void TypeImplementation<Contact>::configure(IndexPropertyMapper &)
diff --git a/common/domain/contact.fbs b/common/domain/contact.fbs
index 34fb1d6..7d7f797 100644
--- a/common/domain/contact.fbs
+++ b/common/domain/contact.fbs
@@ -3,6 +3,7 @@ namespace Sink.ApplicationDomain.Buffer;
 table Contact {
   uid:string;
   fn:string;
+  addressbook:string;
   emails: [string];
   vcard: string;
 }
diff --git a/common/domain/contact.h b/common/domain/contact.h
index c803a9f..976f16e 100644
--- a/common/domain/contact.h
+++ b/common/domain/contact.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2017 Sandro Knauß <knauss@kolabsys.com>
+ *   Copyright (C) 2017 Sandro Knauß <knauss@kolabsys.com>
+ *   Copyright (C) 2017 Christian Mollekopf <mollekopf@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
diff --git a/common/domain/domaintypes.h b/common/domain/domaintypes.h
index 0abdee7..8e31d48 100644
--- a/common/domain/domaintypes.h
+++ b/common/domain/domaintypes.h
@@ -1,5 +1,6 @@
 
 #include "contact.h"
+#include "addressbook.h"
 #include "mail.h"
 #include "folder.h"
 #include "event.h"