2 files changed, 33 insertions, 0 deletions

diff --git a/examples/maildirresource/libmaildir/maildir.cpp b/examples/maildirresource/libmaildir/maildir.cpp
index 0057b26..59e7e5c 100644
--- a/examples/maildirresource/libmaildir/maildir.cpp
+++ b/examples/maildirresource/libmaildir/maildir.cpp
@@ -177,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);
@@ -559,6 +566,19 @@ QDateTime Maildir::lastModified(const QString& key) const
     return info.lastModified();
 }
 
+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;
diff --git a/examples/maildirresource/libmaildir/maildir.h b/examples/maildirresource/libmaildir/maildir.h
index 5936515..6c68656 100644
--- a/examples/maildirresource/libmaildir/maildir.h
+++ b/examples/maildirresource/libmaildir/maildir.h
@@ -262,6 +262,19 @@ public:
      querying the last error string. */
     QString lastError() const;
 
+    /**
+     * Returns the key from the file identified by the full path @param file.
+     */
+    static QString getKeyFromFile( const QString& file );
+
+    /**
+     * Returns the directory from a file.
+     * 
+     * Strips key and new/cur/tmp.
+     * The returned path is ended with a trailing slash.
+     */
+    static QString getDirectoryFromFile( const QString& file );
+
 private:
     void swap( const Maildir& );
     class Private;