5 files changed, 99 insertions, 20 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48a06f7..9e2b3bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(ECMSetupVersion)
 include(KDEInstallDirs)
 
 find_package(Qt5 COMPONENTS REQUIRED Core Network)
-find_package(KF5 COMPONENTS REQUIRED Async Mime)
+find_package(KF5 COMPONENTS REQUIRED Async Mime Contacts)
 find_package(KPimKDAV REQUIRED)
 find_package(FlatBuffers REQUIRED)
 
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 676342d..5e26cd9 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -71,6 +71,7 @@ set(command_SRCS
     adaptorfactoryregistry.cpp
     synchronizer.cpp
     synchronizerstore.cpp
+    contactpreprocessor.cpp
     mailpreprocessor.cpp
     specialpurposepreprocessor.cpp
     datastorequery.cpp
@@ -115,8 +116,8 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME}
     SOVERSION 0
     EXPORT_NAME ${PROJECT_NAME}
 )
-qt5_use_modules(${PROJECT_NAME} Network)
-target_link_libraries(${PROJECT_NAME} ${storage_LIBS} KF5::Async KF5::Mime)
+qt5_use_modules(${PROJECT_NAME} Network Gui)
+target_link_libraries(${PROJECT_NAME} ${storage_LIBS} KF5::Async KF5::Mime KF5::Contacts)
 install(TARGETS ${PROJECT_NAME}
     EXPORT SinkTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ${LIBRARY_NAMELINK} )
 
diff --git a/common/contactpreprocessor.cpp b/common/contactpreprocessor.cpp
new file mode 100644
index 0000000..fbf5e2c
--- /dev/null
+++ b/common/contactpreprocessor.cpp
@@ -0,0 +1,60 @@
+/*
+ *   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 "contactpreprocessor.h"
+
+#include <KContacts/VCardConverter>
+#include <KContacts/Addressee>
+
+using namespace Sink;
+
+SINK_DEBUG_AREA("contactpreprocessor")
+
+void updatedProperties(Sink::ApplicationDomain::Contact &contact, const KContacts::Addressee &addressee)
+{
+    contact.setUid(addressee.uid());
+    contact.setFn(addressee.formattedName());
+    QByteArrayList emails;
+    for (const auto email : addressee.emails()) {
+        emails << email.toUtf8();
+    }
+    contact.setEmails(emails);
+}
+
+ContactPropertyExtractor::~ContactPropertyExtractor()
+{
+}
+
+void ContactPropertyExtractor::newEntity(Sink::ApplicationDomain::Contact &contact)
+{
+    KContacts::VCardConverter converter;
+    const auto addressee = converter.parseVCard(contact.getVcard());
+    if (!addressee.isEmpty()) {
+        updatedProperties(contact, addressee);
+    }
+}
+
+void ContactPropertyExtractor::modifiedEntity(const Sink::ApplicationDomain::Contact &oldContact, Sink::ApplicationDomain::Contact &newContact)
+{
+    KContacts::VCardConverter converter;
+    const auto addressee = converter.parseVCard(newContact.getVcard());
+    if (!addressee.isEmpty()) {
+        updatedProperties(newContact, addressee);
+    }
+}
diff --git a/common/contactpreprocessor.h b/common/contactpreprocessor.h
new file mode 100644
index 0000000..d3aaf39
--- /dev/null
+++ b/common/contactpreprocessor.h
@@ -0,0 +1,32 @@
+/*
+ *   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 "sink_export.h"
+
+#include "pipeline.h"
+
+class SINK_EXPORT ContactPropertyExtractor : public Sink::EntityPreprocessor<Sink::ApplicationDomain::Contact>
+{
+public:
+    virtual ~ContactPropertyExtractor();
+    virtual void newEntity(Sink::ApplicationDomain::Contact &mail) Q_DECL_OVERRIDE;
+    virtual void modifiedEntity(const Sink::ApplicationDomain::Contact &oldContact, Sink::ApplicationDomain::Contact &newContact) Q_DECL_OVERRIDE;
+};
diff --git a/examples/davresource/davresource.cpp b/examples/davresource/davresource.cpp
index 81ae675..b0a9ea3 100644
--- a/examples/davresource/davresource.cpp
+++ b/examples/davresource/davresource.cpp
@@ -31,6 +31,8 @@
 #include "facadefactory.h"
 #include "adaptorfactoryregistry.h"
 
+#include "contactpreprocessor.h"
+
 #include <KDAV/DavCollection>
 #include <KDAV/DavCollectionsFetchJob>
 #include <KDAV/DavItemsListJob>
@@ -523,23 +525,7 @@ DavResource::DavResource(const Sink::ResourceContext &resourceContext)
     setupSynchronizer(synchronizer);
     //setupInspector(QSharedPointer<MaildirInspector>::create(resourceContext));
 
-    /*
-    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor(resourceContext.resourceType, resourceContext.instanceId()) << new MaildirMimeMessageMover(resourceContext.instanceId(), mMaildirPath) << new MaildirMailPropertyExtractor);
-    setupPreprocessors(ENTITY_TYPE_FOLDER, QVector<Sink::Preprocessor*>() << new FolderPreprocessor(mMaildirPath));
-
-    KPIM::Contactdir dir(mMaildirPath, true);
-    SinkTrace() << "Started maildir resource for maildir: " << mMaildirPath;
-    {
-        auto draftsFolder = dir.addSubFolder("Drafts");
-        auto remoteId = synchronizer->createFolder(draftsFolder, "folder", QByteArrayList() << "drafts");
-        auto draftsFolderLocalId = synchronizer->syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, remoteId);
-    }
-    {
-        auto trashFolder = dir.addSubFolder("Trash");
-        auto remoteId = synchronizer->createFolder(trashFolder, "folder", QByteArrayList() << "trash");
-        auto trashFolderLocalId = synchronizer->syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, remoteId);
-    }
-    synchronizer->commit();*/
+    setupPreprocessors(ENTITY_TYPE_CONTACT, QVector<Sink::Preprocessor*>() << new ContactPropertyExtractor);
 }