4 files changed, 24 insertions, 3 deletions

diff --git a/examples/maildirresource/libmaildir/maildir.cpp b/examples/maildirresource/libmaildir/maildir.cpp
index 59e7e5c..8d6de3e 100644
--- a/examples/maildirresource/libmaildir/maildir.cpp
+++ b/examples/maildirresource/libmaildir/maildir.cpp
@@ -22,6 +22,7 @@
 
 #include <QDateTime>
 #include <QDir>
+#include <QDirIterator>
 #include <QFileInfo>
 #include <QHostInfo>
 #include <QUuid>
@@ -566,6 +567,18 @@ QDateTime Maildir::lastModified(const QString& key) const
     return info.lastModified();
 }
 
+void Maildir::importNewMails()
+{
+    QDirIterator entryIterator(pathToNew(), QDir::Files);
+    while (entryIterator.hasNext()) {
+        const QString filePath = QDir::fromNativeSeparators(entryIterator.next());
+        QFile file(filePath);
+        if (!file.rename(pathToCurrent() +"/" + entryIterator.fileName())) {
+            qWarning() << "Failed to rename the file: " << file.errorString();
+        }
+    }
+}
+
 QString Maildir::getKeyFromFile(const QString& file)
 {
     return Maildir::Private::stripFlags(file.split('/').last());
diff --git a/examples/maildirresource/libmaildir/maildir.h b/examples/maildirresource/libmaildir/maildir.h
index 6c68656..31778ac 100644
--- a/examples/maildirresource/libmaildir/maildir.h
+++ b/examples/maildirresource/libmaildir/maildir.h
@@ -163,6 +163,11 @@ public:
     QDateTime lastModified( const QString &key ) const;
 
     /**
+     * Move all mails in new to cur
+     */
+    void importNewMails();
+
+    /**
      * Return the contents of the file in the maildir with the given @p key.
      */
     QByteArray readEntry( const QString& key ) const;
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index 05fcbb6..839b427 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -145,6 +145,9 @@ void MaildirResource::synchronizeMails(Sink::Storage::Transaction &transaction,
         return;
     }
 
+    Trace() << "Importing new mail.";
+    maildir.importNewMails();
+
     auto listingPath = maildir.pathToCurrent();
     auto entryIterator = QSharedPointer<QDirIterator>::create(listingPath, QDir::Files);
     Trace() << "Looking into " << listingPath;
@@ -199,7 +202,7 @@ void MaildirResource::synchronizeMails(Sink::Storage::Transaction &transaction,
     }
     mSynchronizerQueue.commit();
     const auto elapsed = time->elapsed();
-    Trace() << "Synchronized " << count << " mails in " << listingPath << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
+    Log() << "Synchronized " << count << " mails in " << listingPath << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
 
 }
 
diff --git a/tests/maildirresourcetest.cpp b/tests/maildirresourcetest.cpp
index 28a1d44..eefe1e9 100644
--- a/tests/maildirresourcetest.cpp
+++ b/tests/maildirresourcetest.cpp
@@ -205,7 +205,7 @@ private Q_SLOTS:
 
         auto mailModel = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
         QTRY_VERIFY(mailModel->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
-        QCOMPARE(mailModel->rowCount(QModelIndex()), 2);
+        QCOMPARE(mailModel->rowCount(QModelIndex()), 3);
     }
 
     void testSyncMailRemoval()
@@ -228,7 +228,7 @@ private Q_SLOTS:
 
         auto mailModel = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
         QTRY_VERIFY(mailModel->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
-        QCOMPARE(mailModel->rowCount(QModelIndex()), 1);
+        QCOMPARE(mailModel->rowCount(QModelIndex()), 2);
     }
 
     void testCreateFolder()