1 files changed, 109 insertions, 84 deletions

diff --git a/examples/maildirresource/libmaildir/maildir.cpp b/examples/maildirresource/libmaildir/maildir.cpp
index 3d4630f..59e7e5c 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)) {
@@ -178,6 +177,13 @@ public:
         return realKey;
     }
 
+    static QString stripFlags(const QString& key)
+    {
+        const QRegExp rx = *(statusSeparatorRx());
+        const int index = key.indexOf(rx);
+        return key.mid(0, index);
+    }
+
     static QString subDirNameForFolderName(const QString &folderName)
     {
         return QString::fromLatin1(".%1.directory").arg(folderName);
@@ -560,7 +566,20 @@ QDateTime Maildir::lastModified(const QString& key) const
     return info.lastModified();
 }
 
-QByteArray Maildir::readEntryHeadersFromFile(const QString& file) const
+QString Maildir::getKeyFromFile(const QString& file)
+{
+    return Maildir::Private::stripFlags(file.split('/').last());
+}
+
+QString Maildir::getDirectoryFromFile( const QString& file )
+{
+    auto parts = file.split('/');
+    parts.removeLast(); //File
+    parts.removeLast(); //cur/new/tmp
+    return parts.join('/') + "/";
+}
+
+QByteArray Maildir::readEntryHeadersFromFile(const QString& file)
 {
     QByteArray result;
 
@@ -643,9 +662,14 @@ QString Maildir::addEntry(const QByteArray& data)
 
     QFile f(key);
     bool result = f.open(QIODevice::WriteOnly);
+    if (!result) {
+       qWarning() << f.errorString();
+       qWarning() << "Cannot write to mail file: " << key;
+    }
     result = result & (f.write(data) != -1);
     f.close();
     if (!result) {
+       qWarning() << "Cannot write to mail file: " << key;
        // d->lastError = i18n("Cannot write to mail file %1." , key);
        return QString();
     }
@@ -688,88 +712,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;