4 files changed, 123 insertions, 100 deletions

diff --git a/examples/maildirresource/libmaildir/maildir.cpp b/examples/maildirresource/libmaildir/maildir.cpp
index f8ca606..daf2e8f 100644
--- a/examples/maildirresource/libmaildir/maildir.cpp
+++ b/examples/maildirresource/libmaildir/maildir.cpp
@@ -142,7 +142,6 @@ public:
     {
         // KeyCache* keyCache = KeyCache::self();
         // if (keyCache->isNewKey(path, key)) {
-        qWarning() << path + QString::fromLatin1("/new/") + key;
         if (QFile::exists(path + QString::fromLatin1("/new/") + key)) {
 #ifdef DEBUG_KEYCACHE_CONSITENCY
           if (!QFile::exists(path + QString::fromLatin1("/new/") + key)) {
@@ -688,88 +687,89 @@ bool Maildir::removeEntry(const QString& key)
     // return QFile::remove(realKey);
 }
 
-// QString Maildir::changeEntryFlags(const QString& key, const Sink::Item::Flags& flags)
-// {
-//     QString realKey(d->findRealKey(key));
-//     if (realKey.isEmpty()) {
-//         qWarning() << "Maildir::changeEntryFlags unable to find: " << key;
-//         d->lastError = i18n("Cannot locate mail file %1." , key);
-//         return QString();
-//     }
-//
-//     const QRegExp rx = *(statusSeparatorRx());
-//     QString finalKey = key.left(key.indexOf(rx));
-//
-//     QStringList mailDirFlags;
-//     Q_FOREACH (const Sink::Item::Flag &flag, flags) {
-//       if (flag == Sink::MessageFlags::Forwarded)
-//         mailDirFlags << QLatin1String("P");
-//       if (flag == Sink::MessageFlags::Replied)
-//         mailDirFlags << QLatin1String("R");
-//       if (flag == Sink::MessageFlags::Seen)
-//         mailDirFlags << QLatin1String("S");
-//       if (flag == Sink::MessageFlags::Deleted)
-//         mailDirFlags << QLatin1String("T");
-//       if (flag == Sink::MessageFlags::Flagged)
-//         mailDirFlags << QLatin1String("F");
-//     }
-//     mailDirFlags.sort();
-//     if (!mailDirFlags.isEmpty()) {
-// #ifdef Q_OS_WIN
-//       finalKey.append(QLatin1String("!2,") + mailDirFlags.join(QString()));
-// #else
-//       finalKey.append(QLatin1String(":2,") + mailDirFlags.join(QString()));
-// #endif
-//     }
-//
-//     QString newUniqueKey = finalKey; //key without path
-//     finalKey.prepend(d->path + QString::fromLatin1("/cur/"));
-//
-//     if (realKey == finalKey) {
-//       // Somehow it already is named this way (e.g. migration bug -> wrong status in sink)
-//       return newUniqueKey;
-//     }
-//
-//     QFile f(realKey);
-//     if (QFile::exists(finalKey)) {
-//       QFile destFile(finalKey);
-//       QByteArray destContent;
-//       if (destFile.open(QIODevice::ReadOnly)) {
-//         destContent = destFile.readAll();
-//         destFile.close();
-//       }
-//       QByteArray sourceContent;
-//       if (f.open(QIODevice::ReadOnly)) {
-//         sourceContent = f.readAll();
-//         f.close();
-//       }
-//
-//       if (destContent != sourceContent) {
-//          QString newFinalKey = QLatin1String("1-") + newUniqueKey;
-//          int i = 1;
-//          while (QFile::exists(d->path + QString::fromLatin1("/cur/") + newFinalKey)) {
-//            i++;
-//            newFinalKey = QString::number(i) + QLatin1Char('-') + newUniqueKey;
-//          }
-//          finalKey = d->path + QString::fromLatin1("/cur/") + newFinalKey;
-//       } else {
-//             QFile::remove(finalKey); //they are the same
-//       }
-//     }
-//
-//     if (!f.rename(finalKey)) {
-//         qWarning() << "Maildir: Failed to rename entry: " << f.fileName() << " to "  << finalKey  << "! Error: " << f.errorString();
-//         d->lastError = i18n("Failed to update the file name %1 to %2 on the disk. The error was: %3." , f.fileName(), finalKey, f.errorString());
-//         return QString();
-//      }
-//
-//     KeyCache *keyCache = KeyCache::self();
-//     keyCache->removeKey(d->path, key);
-//     keyCache->addCurKey(d->path, newUniqueKey);
-//
-//     return newUniqueKey;
-// }
-//
+QString Maildir::changeEntryFlags(const QString& key, const Maildir::Flags& flags)
+{
+    QString realKey(d->findRealKey(key));
+    if (realKey.isEmpty()) {
+        qWarning() << "Maildir::changeEntryFlags unable to find: " << key;
+        // d->lastError = i18n("Cannot locate mail file %1." , key);
+        return QString();
+    }
+
+    const QRegExp rx = *(statusSeparatorRx());
+    QString finalKey = key.left(key.indexOf(rx));
+
+    QStringList mailDirFlags;
+    if (flags & Forwarded)
+        mailDirFlags << QLatin1String("P");
+    if (flags & Replied)
+        mailDirFlags << QLatin1String("R");
+    if (flags & Seen)
+        mailDirFlags << QLatin1String("S");
+    if (flags & Deleted)
+        mailDirFlags << QLatin1String("T");
+    if (flags & Flagged)
+        mailDirFlags << QLatin1String("F");
+
+    mailDirFlags.sort();
+    if (!mailDirFlags.isEmpty()) {
+#ifdef Q_OS_WIN
+      finalKey.append(QLatin1String("!2,") + mailDirFlags.join(QString()));
+#else
+      finalKey.append(QLatin1String(":2,") + mailDirFlags.join(QString()));
+#endif
+    }
+
+    QString newUniqueKey = finalKey; //key without path
+    finalKey.prepend(d->path + QString::fromLatin1("/cur/"));
+
+    if (realKey == finalKey) {
+      // Somehow it already is named this way (e.g. migration bug -> wrong status in sink)
+      qWarning() << "File already named that way: " << newUniqueKey << finalKey;
+      return newUniqueKey;
+    }
+
+    QFile f(realKey);
+    if (QFile::exists(finalKey)) {
+      QFile destFile(finalKey);
+      QByteArray destContent;
+      if (destFile.open(QIODevice::ReadOnly)) {
+        destContent = destFile.readAll();
+        destFile.close();
+      }
+      QByteArray sourceContent;
+      if (f.open(QIODevice::ReadOnly)) {
+        sourceContent = f.readAll();
+        f.close();
+      }
+
+      if (destContent != sourceContent) {
+         QString newFinalKey = QLatin1String("1-") + newUniqueKey;
+         int i = 1;
+         while (QFile::exists(d->path + QString::fromLatin1("/cur/") + newFinalKey)) {
+           i++;
+           newFinalKey = QString::number(i) + QLatin1Char('-') + newUniqueKey;
+         }
+         finalKey = d->path + QString::fromLatin1("/cur/") + newFinalKey;
+      } else {
+            QFile::remove(finalKey); //they are the same
+      }
+    }
+
+    if (!f.rename(finalKey)) {
+        qWarning() << "Maildir: Failed to rename entry: " << f.fileName() << " to "  << finalKey  << "! Error: " << f.errorString();
+        // d->lastError = i18n("Failed to update the file name %1 to %2 on the disk. The error was: %3." , f.fileName(), finalKey, f.errorString());
+        return QString();
+    }
+    qWarning() << "Renamed file: " << f.fileName() << finalKey;
+
+    // KeyCache *keyCache = KeyCache::self();
+    // keyCache->removeKey(d->path, key);
+    // keyCache->addCurKey(d->path, newUniqueKey);
+
+    return newUniqueKey;
+}
+
 Maildir::Flags Maildir::readEntryFlags(const QString& key)
 {
     Flags flags;
diff --git a/examples/maildirresource/libmaildir/maildir.h b/examples/maildirresource/libmaildir/maildir.h
index 42d53e6..5936515 100644
--- a/examples/maildirresource/libmaildir/maildir.h
+++ b/examples/maildirresource/libmaildir/maildir.h
@@ -167,13 +167,14 @@ public:
      */
     QByteArray readEntry( const QString& key ) const;
 
-    enum MailFlags {
-        Forwarded,
-        Replied,
-        Seen,
-        Flagged
+    enum Flag {
+        Forwarded = 0x1,
+        Replied = 0x2,
+        Seen = 0x4,
+        Flagged = 0x8,
+        Deleted = 0x10
     };
-    Q_DECLARE_FLAGS(Flags, MailFlags);
+    Q_DECLARE_FLAGS(Flags, Flag);
 
     /**
      * Return the flags encoded in the maildir file name for an entry
@@ -211,7 +212,7 @@ public:
      * Change the flags for an entry specified by @p key. Returns the new key of the entry (the key might change because
      * flags are stored in the unique filename).
      */
-    // QString changeEntryFlags( const QString& key, const Sink::Item::Flags& flags );
+    QString changeEntryFlags( const QString& key, const Flags& flags );
 
     /**
      * Moves this maildir into @p destination.
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index 3b263a7..cb51881 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -269,9 +269,9 @@ KAsync::Job<void> MaildirResource::replay(Sink::Storage &synchronizationStore, c
             const auto parentFolderPath = parentFolderRemoteId;
             KPIM::Maildir maildir(parentFolderPath, false);
             //FIXME assemble the MIME message
-            const auto id = maildir.addEntry("foobar");
-            Trace() << "Creating a new mail: " << id;
-            recordRemoteId(ENTITY_TYPE_MAIL, mail.identifier(), id.toUtf8(), synchronizationTransaction);
+            const auto remoteId = maildir.addEntry("foobar");
+            Trace() << "Creating a new mail: " << 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);
@@ -279,7 +279,26 @@ KAsync::Job<void> MaildirResource::replay(Sink::Storage &synchronizationStore, c
             QFile::remove(remoteId);
             removeRemoteId(ENTITY_TYPE_MAIL, uid, remoteId, synchronizationTransaction);
         } else if (operation == Sink::Operation_Modification) {
-            Warning() << "Mail modifications are not implemented";
+            const auto uid = Sink::Storage::uidFromKey(key);
+            const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, uid, synchronizationTransaction);
+            Trace() << "Modifying a mail: " << remoteId;
+            auto parts = remoteId.split('/');
+            const auto filename = parts.takeLast(); //filename
+            parts.removeLast(); //cur/new folder
+            auto maildirPath = parts.join('/');
+
+            KPIM::Maildir maildir(maildirPath, false);
+
+            const Sink::ApplicationDomain::Mail mail(mResourceInstanceIdentifier, Sink::Storage::uidFromKey(key), revision, mMailAdaptorFactory->createAdaptor(entity));
+
+            //get flags from
+            KPIM::Maildir::Flags flags;
+            if (!mail.getProperty("unread").toBool()) {
+                flags |= KPIM::Maildir::Seen;
+            }
+
+            auto newRemoteId = maildir.changeEntryFlags(filename, flags);
+            updateRemoteId(ENTITY_TYPE_MAIL, uid, QString(maildirPath + "/cur/" + newRemoteId).toUtf8(), synchronizationTransaction);
         } else {
             Warning() << "Unkown operation" << operation;
         }
@@ -303,11 +322,11 @@ KAsync::Job<void> MaildirResource::inspect(int inspectionType, const QByteArray
             if (property == "unread") {
                 const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, entityId, synchronizationTransaction);
                 const auto flags = KPIM::Maildir::readEntryFlags(remoteId.split('/').last());
-                if (expectedValue.toBool() && !(flags & KPIM::Maildir::Seen)) {
-                    return KAsync::error<void>(1, "Expected seen but couldn't find it.");
+                if (expectedValue.toBool() && (flags & KPIM::Maildir::Seen)) {
+                    return KAsync::error<void>(1, "Expected unread but couldn't find it.");
                 }
-                if (!expectedValue.toBool() && (flags & KPIM::Maildir::Seen)) {
-                    return KAsync::error<void>(1, "Expected seen but couldn't find it.");
+                if (!expectedValue.toBool() && !(flags & KPIM::Maildir::Seen)) {
+                    return KAsync::error<void>(1, "Expected read but couldn't find it.");
                 }
                 return KAsync::null<void>();
             }
@@ -319,7 +338,7 @@ KAsync::Job<void> MaildirResource::inspect(int inspectionType, const QByteArray
                 msg->parse();
 
                 if (msg->subject(true)->asUnicodeString() != expectedValue.toString()) {
-                    return KAsync::error<void>(1, "Subject not as expected.");
+                    return KAsync::error<void>(1, "Subject not as expected: " + msg->subject(true)->asUnicodeString());
                 }
                 return KAsync::null<void>();
             }
diff --git a/examples/maildirresource/maildirresource.h b/examples/maildirresource/maildirresource.h
index 9af2f39..32eb88c 100644
--- a/examples/maildirresource/maildirresource.h
+++ b/examples/maildirresource/maildirresource.h
@@ -32,12 +32,15 @@ class MaildirMailAdaptorFactory;
 class MaildirFolderAdaptorFactory;
 
 /**
- * A maildir resource
+ * A maildir resource.
  * 
  * Implementation details:
  * The remoteid's have the following formats:
  * files: full file path
  * directories: full directory path
+ * 
+ * The resource moves all messages from new to cur during sync and thus expectes all messages that are in the store to always reside in cur.
+ * The tmp directory is never directly used
  */
 class MaildirResource : public Sink::GenericResource
 {