4 files changed, 152 insertions, 98 deletions

diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index 637e371..eae6ead 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -19,6 +19,10 @@
 #include <QDataStream>
 #include <QTime>
 
+//This is the resources entity type, and not the domain type
+#define ENTITY_TYPE_MAIL "mail"
+#define ENTITY_TYPE_FOLDER "folder"
+
 static int sBatchSize = 100;
 // This interval directly affects the roundtrip time of single commands
 static int sCommitInterval = 10;
@@ -392,11 +396,72 @@ void GenericResource::addType(const QByteArray &type, DomainTypeAdaptorFactoryIn
 {
     mPipeline->setPreprocessors(type, preprocessors);
     mPipeline->setAdaptorFactory(type, factory);
+    mAdaptorFactories.insert(type, factory);
 }
 
 KAsync::Job<void> GenericResource::replay(Sink::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value)
 {
-    return KAsync::null<void>();
+    Sink::EntityBuffer buffer(value);
+    const Sink::Entity &entity = buffer.entity();
+    const auto metadataBuffer = Sink::EntityBuffer::readBuffer<Sink::Metadata>(entity.metadata());
+    Q_ASSERT(metadataBuffer);
+    if (!metadataBuffer->replayToSource()) {
+        Trace() << "Change is coming from the source";
+        return KAsync::null<void>();
+    }
+    const qint64 revision = metadataBuffer ? metadataBuffer->revision() : -1;
+    const auto operation = metadataBuffer ? metadataBuffer->operation() : Sink::Operation_Creation;
+    const auto uid = Sink::Storage::uidFromKey(key);
+    QByteArray oldRemoteId;
+
+    if (operation != Sink::Operation_Creation) {
+        auto synchronizationTransaction = synchronizationStore.createTransaction(Sink::Storage::ReadOnly);
+        oldRemoteId = resolveLocalId(type, uid, synchronizationTransaction);
+    }
+    Trace() << "Replaying " << key << type;
+
+    KAsync::Job<QByteArray> job = KAsync::null<QByteArray>();
+    if (type == ENTITY_TYPE_FOLDER) {
+        const Sink::ApplicationDomain::Folder folder(mResourceInstanceIdentifier, uid, revision, mAdaptorFactories.value(type)->createAdaptor(entity));
+        job = replay(folder, operation, oldRemoteId);
+    } else if (type == ENTITY_TYPE_MAIL) {
+        const Sink::ApplicationDomain::Mail mail(mResourceInstanceIdentifier, uid, revision, mAdaptorFactories.value(type)->createAdaptor(entity));
+        job = replay(mail, operation, oldRemoteId);
+    }
+
+    return job.then<void, QByteArray>([=, &synchronizationStore](const QByteArray &remoteId) {
+        auto synchronizationTransaction = synchronizationStore.createTransaction(Sink::Storage::ReadWrite);
+        Trace() << "Replayed change with remote id: " << remoteId;
+        if (operation == Sink::Operation_Creation) {
+            if (remoteId.isEmpty()) {
+                Warning() << "Returned an empty remoteId from the creation";
+            } else {
+                recordRemoteId(type, uid, remoteId, synchronizationTransaction);
+            }
+        } else if (operation == Sink::Operation_Modification) {
+            if (remoteId.isEmpty()) {
+                Warning() << "Returned an empty remoteId from the creation";
+            } else {
+                updateRemoteId(type, uid, remoteId, synchronizationTransaction);
+            }
+        } else if (operation == Sink::Operation_Removal) {
+            removeRemoteId(type, uid, remoteId, synchronizationTransaction);
+        } else {
+            Warning() << "Unkown operation" << operation;
+        }
+    }, [](int errorCode, const QString &errorMessage) {
+        Warning() << "Failed to replay change: " << errorMessage;
+    });
+}
+
+KAsync::Job<QByteArray> GenericResource::replay(const ApplicationDomain::Mail &, Sink::Operation, const QByteArray &)
+{
+    return KAsync::null<QByteArray>();
+}
+
+KAsync::Job<QByteArray> GenericResource::replay(const ApplicationDomain::Folder &, Sink::Operation, const QByteArray &)
+{
+    return KAsync::null<QByteArray>();
 }
 
 void GenericResource::removeDataFromDisk()
diff --git a/common/genericresource.h b/common/genericresource.h
index 9582f06..c551e29 100644
--- a/common/genericresource.h
+++ b/common/genericresource.h
@@ -61,8 +61,15 @@ private slots:
 
 protected:
     void enableChangeReplay(bool);
+
     void addType(const QByteArray &type, DomainTypeAdaptorFactoryInterface::Ptr factory, const QVector<Sink::Preprocessor *> &preprocessors);
+
+    ///Base implementation call the replay$Type calls
     virtual KAsync::Job<void> replay(Sink::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value);
+    ///Implement to write back changes to the server
+    virtual KAsync::Job<QByteArray> replay(const Sink::ApplicationDomain::Mail &, Sink::Operation, const QByteArray &oldRemoteId);
+    virtual KAsync::Job<QByteArray> replay(const Sink::ApplicationDomain::Folder &, Sink::Operation, const QByteArray &oldRemoteId);
+
     void onProcessorError(int errorCode, const QString &errorMessage);
     void enqueueCommand(MessageQueue &mq, int commandId, const QByteArray &data);
 
@@ -127,5 +134,6 @@ private:
     int mError;
     QTimer mCommitQueueTimer;
     qint64 mClientLowerBoundRevision;
+    QHash<QByteArray, DomainTypeAdaptorFactoryInterface::Ptr> mAdaptorFactories;
 };
 }
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index e1e4d95..3f6ae54 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -49,6 +49,8 @@
 #undef DEBUG_AREA
 #define DEBUG_AREA "resource.maildir"
 
+using namespace Sink;
+
 static QString getFilePathFromMimeMessagePath(const QString &mimeMessagePath)
 {
     auto parts = mimeMessagePath.split('/');
@@ -373,108 +375,86 @@ KAsync::Job<void> MaildirResource::synchronizeWithSource(Sink::Storage &mainStor
     });
 }
 
-KAsync::Job<void> MaildirResource::replay(Sink::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value)
+KAsync::Job<QByteArray> MaildirResource::replay(const ApplicationDomain::Mail &mail, Sink::Operation operation, const QByteArray &oldRemoteId)
 {
-    auto synchronizationTransaction = synchronizationStore.createTransaction(Sink::Storage::ReadWrite);
-
-    Sink::EntityBuffer buffer(value);
-    const Sink::Entity &entity = buffer.entity();
-    const auto metadataBuffer = Sink::EntityBuffer::readBuffer<Sink::Metadata>(entity.metadata());
-    Q_ASSERT(metadataBuffer);
-    if (!metadataBuffer->replayToSource()) {
-        Trace() << "Change is coming from the source";
-        return KAsync::null<void>();
-    }
-    const qint64 revision = metadataBuffer ? metadataBuffer->revision() : -1;
-    const auto operation = metadataBuffer ? metadataBuffer->operation() : Sink::Operation_Creation;
-
-    Trace() << "Replaying " << key << type;
-    if (type == ENTITY_TYPE_FOLDER) {
-        if (operation == Sink::Operation_Creation) {
-            const Sink::ApplicationDomain::Folder folder(mResourceInstanceIdentifier, Sink::Storage::uidFromKey(key), revision, mFolderAdaptorFactory->createAdaptor(entity));
-            auto folderName = folder.getProperty("name").toString();
-            //TODO handle non toplevel folders
-            auto path = mMaildirPath + "/" + folderName;
-            Trace() << "Creating a new folder: " << path;
-            KPIM::Maildir maildir(path, false);
-            maildir.create();
-            recordRemoteId(ENTITY_TYPE_FOLDER, folder.identifier(), path.toUtf8(), synchronizationTransaction);
-        } else if (operation == Sink::Operation_Removal) {
-            const auto uid = Sink::Storage::uidFromKey(key);
-            const auto remoteId = resolveLocalId(ENTITY_TYPE_FOLDER, uid, synchronizationTransaction);
-            const auto path = remoteId;
-            Trace() << "Removing a folder: " << path;
-            KPIM::Maildir maildir(path, false);
-            maildir.remove();
-            removeRemoteId(ENTITY_TYPE_FOLDER, uid, remoteId, synchronizationTransaction);
-        } else if (operation == Sink::Operation_Modification) {
-            Warning() << "Folder modifications are not implemented";
-        } else {
-            Warning() << "Unkown operation" << operation;
-        }
-    } else if (type == ENTITY_TYPE_MAIL) {
-        if (operation == Sink::Operation_Creation) {
-            const Sink::ApplicationDomain::Mail mail(mResourceInstanceIdentifier, Sink::Storage::uidFromKey(key), revision, mMailAdaptorFactory->createAdaptor(entity));
-            const auto remoteId = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
-            Trace() << "Creating a new mail." << remoteId;
-            if (remoteId.isEmpty()) {
-                Warning() << "Failed to create mail: " << remoteId;
-                return KAsync::error<void>(1, "Failed to create mail.");
-            } else {
-                Trace() << "Mail created: " << remoteId;
-                recordRemoteId(ENTITY_TYPE_MAIL, mail.identifier(), remoteId.toUtf8(), synchronizationTransaction);
-            }
-        } else if (operation == Sink::Operation_Removal) {
-            const auto uid = Sink::Storage::uidFromKey(key);
-            const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, uid, synchronizationTransaction);
-            Trace() << "Removing a mail: " << remoteId;
-            QFile::remove(remoteId);
-            removeRemoteId(ENTITY_TYPE_MAIL, uid, remoteId, synchronizationTransaction);
-        } else if (operation == Sink::Operation_Modification) {
-            const auto uid = Sink::Storage::uidFromKey(key);
-            const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, uid, synchronizationTransaction);
-            Trace() << "Modifying a mail: " << remoteId;
-
-            const Sink::ApplicationDomain::Mail mail(mResourceInstanceIdentifier, Sink::Storage::uidFromKey(key), revision, mMailAdaptorFactory->createAdaptor(entity));
-
-            const auto filePath = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
-            const auto maildirPath = KPIM::Maildir::getDirectoryFromFile(filePath);
-            KPIM::Maildir maildir(maildirPath, false);
-
-            const auto messagePathParts = filePath.split("/");
-            if (messagePathParts.isEmpty()) {
-                Warning() << "No message path available: " << remoteId;
-                return KAsync::error<void>(1, "No message path available.");
-            }
-            const auto newIdentifier = messagePathParts.last();
-            QString identifier;
-            if (newIdentifier != KPIM::Maildir::getKeyFromFile(remoteId)) {
-                //Remove the old mime message if it changed
-                Trace() << "Removing old mime message: " << remoteId;
-                QFile(remoteId).remove();
-                identifier = newIdentifier;
-            } else {
-                //The identifier needs to contain the flags for changeEntryFlags to work
-                Q_ASSERT(!remoteId.split('/').isEmpty());
-                identifier = remoteId.split('/').last();
-            }
+    if (operation == Sink::Operation_Creation) {
+        const auto remoteId = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
+        Trace() << "Mail created: " << remoteId;
+        return KAsync::start<QByteArray>([=]() -> QByteArray {
+            return remoteId.toUtf8();
+        });
+    } else if (operation == Sink::Operation_Removal) {
+        Trace() << "Removing a mail: " << oldRemoteId;
+        QFile::remove(oldRemoteId);
+        return KAsync::null<QByteArray>();
+    } else if (operation == Sink::Operation_Modification) {
+        Trace() << "Modifying a mail: " << oldRemoteId;
 
-            //get flags from
-            KPIM::Maildir::Flags flags;
-            if (!mail.getUnread()) {
-                flags |= KPIM::Maildir::Seen;
-            }
-            if (mail.getImportant()) {
-                flags |= KPIM::Maildir::Flagged;
-            }
+        const auto filePath = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
+        const auto maildirPath = KPIM::Maildir::getDirectoryFromFile(filePath);
+        KPIM::Maildir maildir(maildirPath, false);
 
-            const auto newRemoteId = maildir.changeEntryFlags(identifier, flags);
-            updateRemoteId(ENTITY_TYPE_MAIL, uid, QString(maildirPath + "/cur/" + newRemoteId).toUtf8(), synchronizationTransaction);
+        const auto messagePathParts = filePath.split("/");
+        if (messagePathParts.isEmpty()) {
+            Warning() << "No message path available: " << oldRemoteId;
+            return KAsync::error<QByteArray>(1, "No message path available.");
+        }
+        const auto newIdentifier = messagePathParts.last();
+        QString identifier;
+        if (newIdentifier != KPIM::Maildir::getKeyFromFile(oldRemoteId)) {
+            //Remove the old mime message if it changed
+            Trace() << "Removing old mime message: " << oldRemoteId;
+            QFile(oldRemoteId).remove();
+            identifier = newIdentifier;
         } else {
-            Warning() << "Unkown operation" << operation;
+            //The identifier needs to contain the flags for changeEntryFlags to work
+            Q_ASSERT(!oldRemoteId.split('/').isEmpty());
+            identifier = oldRemoteId.split('/').last();
         }
+
+        //get flags from
+        KPIM::Maildir::Flags flags;
+        if (!mail.getUnread()) {
+            flags |= KPIM::Maildir::Seen;
+        }
+        if (mail.getImportant()) {
+            flags |= KPIM::Maildir::Flagged;
+        }
+
+        const auto newRemoteId = maildir.changeEntryFlags(identifier, flags);
+        Warning() << "New remote id: " << QString(maildirPath + "/cur/" + newRemoteId);
+        return KAsync::start<QByteArray>([=]() -> QByteArray {
+            return QString(maildirPath + "/cur/" + newRemoteId).toUtf8();
+        });
     }
-    return KAsync::null<void>();
+    return KAsync::null<QByteArray>();
+}
+
+KAsync::Job<QByteArray> MaildirResource::replay(const ApplicationDomain::Folder &folder, Sink::Operation operation, const QByteArray &oldRemoteId)
+{
+    if (operation == Sink::Operation_Creation) {
+        auto folderName = folder.getName();
+        //FIXME handle non toplevel folders
+        auto path = mMaildirPath + "/" + folderName;
+        Trace() << "Creating a new folder: " << path;
+        KPIM::Maildir maildir(path, false);
+        maildir.create();
+        return KAsync::start<QByteArray>([=]() -> QByteArray {
+            return path.toUtf8();
+        });
+    } else if (operation == Sink::Operation_Removal) {
+        const auto path = oldRemoteId;
+        Trace() << "Removing a folder: " << path;
+        KPIM::Maildir maildir(path, false);
+        maildir.remove();
+        return KAsync::null<QByteArray>();
+    } else if (operation == Sink::Operation_Modification) {
+        Warning() << "Folder modifications are not implemented";
+        return KAsync::start<QByteArray>([=]() -> QByteArray {
+            return oldRemoteId;
+        });
+    }
+    return KAsync::null<QByteArray>();
 }
 
 void MaildirResource::removeFromDisk(const QByteArray &instanceIdentifier)
diff --git a/examples/maildirresource/maildirresource.h b/examples/maildirresource/maildirresource.h
index 33ba3ae..e58dc16 100644
--- a/examples/maildirresource/maildirresource.h
+++ b/examples/maildirresource/maildirresource.h
@@ -50,7 +50,8 @@ public:
     KAsync::Job<void> inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) Q_DECL_OVERRIDE;
     static void removeFromDisk(const QByteArray &instanceIdentifier);
 private:
-    KAsync::Job<void> replay(Sink::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE;
+    KAsync::Job<QByteArray> replay(const Sink::ApplicationDomain::Mail &, Sink::Operation, const QByteArray &oldRemoteId) Q_DECL_OVERRIDE;
+    KAsync::Job<QByteArray> replay(const Sink::ApplicationDomain::Folder &, Sink::Operation, const QByteArray &oldRemoteId) Q_DECL_OVERRIDE;
 
     void synchronizeFolders(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction);
     void synchronizeMails(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, const QString &folder);