A first draft of the threading algorithm.

6 files changed, 286 insertions, 27 deletions

diff --git a/examples/maildirresource/tests/CMakeLists.txt b/examples/maildirresource/tests/CMakeLists.txt
index d6f0fe7..b3e4050 100644
--- a/examples/maildirresource/tests/CMakeLists.txt
+++ b/examples/maildirresource/tests/CMakeLists.txt
@@ -8,6 +8,8 @@ include(SinkTest)
 auto_tests (
     maildirmailtest
     maildirmailsynctest
+    maildirthreadtest
 )
 target_link_libraries(maildirmailtest sink_resource_maildir)
 target_link_libraries(maildirmailsynctest sink_resource_maildir)
+target_link_libraries(maildirthreadtest sink_resource_maildir)
diff --git a/examples/maildirresource/tests/data/maildir2/INBOX/cur/100000000.R28.localhost.localdomain:2,S b/examples/maildirresource/tests/data/maildir2/INBOX/cur/100000000.R28.localhost.localdomain:2,S
new file mode 100644
index 0000000..e899eb7
--- /dev/null
+++ b/examples/maildirresource/tests/data/maildir2/INBOX/cur/100000000.R28.localhost.localdomain:2,S
@@ -0,0 +1,70 @@
+Return-Path: <nepomuk-bounces@kde.org>
+Received: from compute4.internal (compute4.nyi.mail.srv.osa [10.202.2.44])
+         by slots3a1p1 (Cyrus git2.5+0-git-fastmail-8998) with LMTPA;
+         Mon, 11 Mar 2013 14:28:42 -0400
+X-Sieve: CMU Sieve 2.4
+X-Spam-score: 0.0
+X-Spam-hits: BAYES_00 -1.9, RCVD_IN_DNSWL_MED -2.3, RP_MATCHES_RCVD -0.704,
+  LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.3.1
+X-Spam-source: IP='46.4.96.248', Host='postbox.kde.org', Country='unk', FromHeader='org',
+  MailFrom='org'
+X-Spam-charsets: plain='us-ascii'
+X-Resolved-to: chrigi_1@fastmail.fm
+X-Delivered-to: chrigi_1@fastmail.fm
+X-Mail-from: nepomuk-bounces@kde.org
+Received: from mx4.nyi.mail.srv.osa ([10.202.2.203])
+  by compute4.internal (LMTPProxy); Mon, 11 Mar 2013 14:28:42 -0400
+Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
+        by mx4.messagingengine.com (Postfix) with ESMTP id 1C9D2440F88
+        for <chrigi_1@fastmail.fm>; Mon, 11 Mar 2013 14:28:42 -0400 (EDT)
+Received: from postbox.kde.org (localhost [IPv6:::1])
+        by postbox.kde.org (Postfix) with ESMTP id 00FFEB3732B;
+        Mon, 11 Mar 2013 18:28:40 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
+        t=1363026520; bh=cOdvyBAJJ8ho64q0H7rxkl+cB2y6TiyVOX0fO3yZ64U=;
+        h=Date:From:To:Message-ID:In-Reply-To:References:MIME-Version:
+         Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:
+         List-Subscribe:Content-Type:Content-Transfer-Encoding:Sender; b=dv
+        dJAFu+6JCuNun5WIuP4ysfKpLh0DeuhEEfy2cQavUGMICJ27k7tI73x6gN37V5Q/evJ
+        NDFna3/IhNBsAQeLiXs28HKxzcVhbnq5jdFR6fbyo6k1fOKt5vTT1GTDZ+3zIGPD1CU
+        ioDBGxPb/Ds6gee90tjadOj6o+Oc+2ZSq94=
+X-Original-To: nepomuk@kde.org
+X-Remote-Delivered-To: nepomuk@localhost.kde.org
+Received: from build.kde.org (build.kde.org [IPv6:2a01:4f8:160:9363::5])
+ by postbox.kde.org (Postfix) with ESMTP id 4491CB3732B
+ for <nepomuk@kde.org>; Mon, 11 Mar 2013 18:28:27 +0000 (UTC)
+Received: from localhost ([127.0.0.1]) by build.kde.org with esmtp (Exim 4.72)
+ (envelope-from <null@kde.org>) id 1UF7SV-0000gs-11
+ for nepomuk@kde.org; Mon, 11 Mar 2013 18:28:27 +0000
+Date: Mon, 11 Mar 2013 18:28:27 +0000 (UTC)
+From: KDE CI System  <null@kde.org>
+To: nepomuk@kde.org
+Message-ID: <1977027405.27.1363026507008.JavaMail.jenkins@build>
+MIME-Version: 1.0
+X-Jenkins-Job: nepomuk-core_stable
+X-Jenkins-Result: UNSTABLE
+X-Scanned-By: MIMEDefang 2.71 on 46.4.96.248
+Subject: First message
+X-BeenThere: nepomuk@kde.org
+X-Mailman-Version: 2.1.14
+Precedence: list
+List-Id: The Semantic KDE <nepomuk.kde.org>
+List-Unsubscribe: <https://mail.kde.org/mailman/options/nepomuk>,
+ <mailto:nepomuk-request@kde.org?subject=unsubscribe>
+List-Archive: <http://mail.kde.org/pipermail/nepomuk>
+List-Post: <mailto:nepomuk@kde.org>
+List-Help: <mailto:nepomuk-request@kde.org?subject=help>
+List-Subscribe: <https://mail.kde.org/mailman/listinfo/nepomuk>,
+ <mailto:nepomuk-request@kde.org?subject=subscribe>
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Errors-To: nepomuk-bounces@kde.org
+Sender: nepomuk-bounces@kde.org
+X-Truedomain: NotChecked
+
+See <http://build.kde.org/job/nepomuk-core_stable/changes>
+
+_______________________________________________
+Nepomuk mailing list
+Nepomuk@kde.org
+https://mail.kde.org/mailman/listinfo/nepomuk
diff --git a/examples/maildirresource/tests/data/maildir2/INBOX/cur/100000001.R28.localhost.localdomain:2,S b/examples/maildirresource/tests/data/maildir2/INBOX/cur/100000001.R28.localhost.localdomain:2,S
new file mode 100644
index 0000000..cfdd438
--- /dev/null
+++ b/examples/maildirresource/tests/data/maildir2/INBOX/cur/100000001.R28.localhost.localdomain:2,S
@@ -0,0 +1,72 @@
+Return-Path: <nepomuk-bounces@kde.org>
+Received: from compute4.internal (compute4.nyi.mail.srv.osa [10.202.2.44])
+         by slots3a1p1 (Cyrus git2.5+0-git-fastmail-8998) with LMTPA;
+         Mon, 11 Mar 2013 14:28:42 -0400
+X-Sieve: CMU Sieve 2.4
+X-Spam-score: 0.0
+X-Spam-hits: BAYES_00 -1.9, RCVD_IN_DNSWL_MED -2.3, RP_MATCHES_RCVD -0.704,
+  LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.3.1
+X-Spam-source: IP='46.4.96.248', Host='postbox.kde.org', Country='unk', FromHeader='org',
+  MailFrom='org'
+X-Spam-charsets: plain='us-ascii'
+X-Resolved-to: chrigi_1@fastmail.fm
+X-Delivered-to: chrigi_1@fastmail.fm
+X-Mail-from: nepomuk-bounces@kde.org
+Received: from mx4.nyi.mail.srv.osa ([10.202.2.203])
+  by compute4.internal (LMTPProxy); Mon, 11 Mar 2013 14:28:42 -0400
+Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
+        by mx4.messagingengine.com (Postfix) with ESMTP id 1C9D2440F88
+        for <chrigi_1@fastmail.fm>; Mon, 11 Mar 2013 14:28:42 -0400 (EDT)
+Received: from postbox.kde.org (localhost [IPv6:::1])
+        by postbox.kde.org (Postfix) with ESMTP id 00FFEB3732B;
+        Mon, 11 Mar 2013 18:28:40 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
+        t=1363026520; bh=cOdvyBAJJ8ho64q0H7rxkl+cB2y6TiyVOX0fO3yZ64U=;
+        h=Date:From:To:Message-ID:In-Reply-To:References:MIME-Version:
+         Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:
+         List-Subscribe:Content-Type:Content-Transfer-Encoding:Sender; b=dv
+        dJAFu+6JCuNun5WIuP4ysfKpLh0DeuhEEfy2cQavUGMICJ27k7tI73x6gN37V5Q/evJ
+        NDFna3/IhNBsAQeLiXs28HKxzcVhbnq5jdFR6fbyo6k1fOKt5vTT1GTDZ+3zIGPD1CU
+        ioDBGxPb/Ds6gee90tjadOj6o+Oc+2ZSq94=
+X-Original-To: nepomuk@kde.org
+X-Remote-Delivered-To: nepomuk@localhost.kde.org
+Received: from build.kde.org (build.kde.org [IPv6:2a01:4f8:160:9363::5])
+ by postbox.kde.org (Postfix) with ESMTP id 4491CB3732B
+ for <nepomuk@kde.org>; Mon, 11 Mar 2013 18:28:27 +0000 (UTC)
+Received: from localhost ([127.0.0.1]) by build.kde.org with esmtp (Exim 4.72)
+ (envelope-from <null@kde.org>) id 1UF7SV-0000gs-11
+ for nepomuk@kde.org; Mon, 11 Mar 2013 18:28:27 +0000
+Date: Mon, 11 Mar 2013 19:28:27 +0000 (UTC)
+From: KDE CI System  <null@kde.org>
+To: nepomuk@kde.org
+Message-ID: <1000000001.27.1363026507008.JavaMail.jenkins@build>
+In-Reply-To: <1977027405.27.1363026507008.JavaMail.jenkins@build>
+References: <1977027405.27.1363026507008.JavaMail.jenkins@build>
+MIME-Version: 1.0
+X-Jenkins-Job: nepomuk-core_stable
+X-Jenkins-Result: UNSTABLE
+X-Scanned-By: MIMEDefang 2.71 on 46.4.96.248
+Subject: ThreadLeader
+X-BeenThere: nepomuk@kde.org
+X-Mailman-Version: 2.1.14
+Precedence: list
+List-Id: The Semantic KDE <nepomuk.kde.org>
+List-Unsubscribe: <https://mail.kde.org/mailman/options/nepomuk>,
+ <mailto:nepomuk-request@kde.org?subject=unsubscribe>
+List-Archive: <http://mail.kde.org/pipermail/nepomuk>
+List-Post: <mailto:nepomuk@kde.org>
+List-Help: <mailto:nepomuk-request@kde.org?subject=help>
+List-Subscribe: <https://mail.kde.org/mailman/listinfo/nepomuk>,
+ <mailto:nepomuk-request@kde.org?subject=subscribe>
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Errors-To: nepomuk-bounces@kde.org
+Sender: nepomuk-bounces@kde.org
+X-Truedomain: NotChecked
+
+See <http://build.kde.org/job/nepomuk-core_stable/changes>
+
+_______________________________________________
+Nepomuk mailing list
+Nepomuk@kde.org
+https://mail.kde.org/mailman/listinfo/nepomuk
diff --git a/examples/maildirresource/tests/maildirmailsynctest.cpp b/examples/maildirresource/tests/maildirmailsynctest.cpp
index f2cf3e0..bafd5a8 100644
--- a/examples/maildirresource/tests/maildirmailsynctest.cpp
+++ b/examples/maildirresource/tests/maildirmailsynctest.cpp
@@ -25,36 +25,11 @@
 #include "common/test.h"
 #include "common/domain/applicationdomaintype.h"
 
+#include "utils.h"
+
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
 
-static bool copyRecursively(const QString &srcFilePath, const QString &tgtFilePath)
-{
-    QFileInfo srcFileInfo(srcFilePath);
-    if (srcFileInfo.isDir()) {
-        QDir targetDir(tgtFilePath);
-        targetDir.cdUp();
-        if (!targetDir.mkdir(QFileInfo(srcFilePath).fileName())) {
-            qWarning() << "Failed to create directory " << tgtFilePath;
-            return false;
-        }
-        QDir sourceDir(srcFilePath);
-        QStringList fileNames = sourceDir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden | QDir::System);
-        foreach (const QString &fileName, fileNames) {
-            const QString newSrcFilePath = srcFilePath + QLatin1Char('/') + fileName;
-            const QString newTgtFilePath = tgtFilePath + QLatin1Char('/') + fileName;
-            if (!copyRecursively(newSrcFilePath, newTgtFilePath))
-                return false;
-        }
-    } else {
-        if (!QFile::copy(srcFilePath, tgtFilePath)) {
-            qWarning() << "Failed to copy file " << tgtFilePath;
-            return false;
-        }
-    }
-    return true;
-}
-
 /**
  * Test of complete system using the maildir resource.
  *
diff --git a/examples/maildirresource/tests/maildirthreadtest.cpp b/examples/maildirresource/tests/maildirthreadtest.cpp
new file mode 100644
index 0000000..a74869c
--- /dev/null
+++ b/examples/maildirresource/tests/maildirthreadtest.cpp
@@ -0,0 +1,90 @@
+/*
+ *   Copyright (C) 2016 Christian Mollekopf <chrigi_1@fastmail.fm>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ */
+#include <QtTest>
+
+#include <tests/mailthreadtest.h>
+#include "../maildirresource.h"
+#include "../libmaildir/maildir.h"
+
+#include "common/test.h"
+#include "common/domain/applicationdomaintype.h"
+
+#include "utils.h";
+
+using namespace Sink;
+using namespace Sink::ApplicationDomain;
+
+/**
+ * Test of complete system using the maildir resource.
+ *
+ * This test requires the maildir resource installed.
+ */
+class MaildirThreadTest : public Sink::MailThreadTest
+{
+    Q_OBJECT
+
+    QTemporaryDir tempDir;
+    QString targetPath;
+
+protected:
+    void resetTestEnvironment() Q_DECL_OVERRIDE
+    {
+        targetPath = tempDir.path() + "/maildir2/";
+        QDir dir(targetPath);
+        dir.removeRecursively();
+        copyRecursively(TESTDATAPATH "/maildir2", targetPath);
+    }
+
+    Sink::ApplicationDomain::SinkResource createResource() Q_DECL_OVERRIDE
+    {
+        auto resource = ApplicationDomain::MaildirResource::create("account1");
+        resource.setProperty("path", targetPath);
+        return resource;
+    }
+
+    Sink::ApplicationDomain::SinkResource createFaultyResource() Q_DECL_OVERRIDE
+    {
+        auto resource = ApplicationDomain::MaildirResource::create("account1");
+        resource.setProperty("path", "");
+        return resource;
+    }
+
+    void removeResourceFromDisk(const QByteArray &identifier) Q_DECL_OVERRIDE
+    {
+        ::MaildirResource::removeFromDisk(identifier);
+    }
+
+    QByteArray createMessage(const QStringList &folderPath, const QByteArray &message) Q_DECL_OVERRIDE
+    {
+        auto rootPath = tempDir.path() + "/maildir2/";
+        KPIM::Maildir maildir(rootPath + folderPath.join('/'));
+        return maildir.addEntry(message).toUtf8();
+    }
+
+    void removeMessage(const QStringList &folderPath, const QByteArray &messageIdentifier) Q_DECL_OVERRIDE
+    {
+        auto rootPath = tempDir.path() + "/maildir2/";
+        KPIM::Maildir maildir(rootPath + folderPath.join('/'));
+        maildir.removeEntry(messageIdentifier);
+    }
+};
+
+QTEST_MAIN(MaildirThreadTest)
+
+#include "maildirthreadtest.moc"
diff --git a/examples/maildirresource/tests/utils.h b/examples/maildirresource/tests/utils.h
new file mode 100644
index 0000000..6e25353
--- /dev/null
+++ b/examples/maildirresource/tests/utils.h
@@ -0,0 +1,50 @@
+/*
+ *   Copyright (C) 2016 Christian Mollekopf <chrigi_1@fastmail.fm>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ */
+#pragma once
+
+#include <QFileInfo>
+#include <QDir>
+#include <QDebug>
+
+static bool copyRecursively(const QString &srcFilePath, const QString &tgtFilePath)
+{
+    QFileInfo srcFileInfo(srcFilePath);
+    if (srcFileInfo.isDir()) {
+        QDir targetDir(tgtFilePath);
+        targetDir.cdUp();
+        if (!targetDir.mkdir(QFileInfo(srcFilePath).fileName())) {
+            qWarning() << "Failed to create directory " << tgtFilePath;
+            return false;
+        }
+        QDir sourceDir(srcFilePath);
+        QStringList fileNames = sourceDir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden | QDir::System);
+        foreach (const QString &fileName, fileNames) {
+            const QString newSrcFilePath = srcFilePath + QLatin1Char('/') + fileName;
+            const QString newTgtFilePath = tgtFilePath + QLatin1Char('/') + fileName;
+            if (!copyRecursively(newSrcFilePath, newTgtFilePath))
+                return false;
+        }
+    } else {
+        if (!QFile::copy(srcFilePath, tgtFilePath)) {
+            qWarning() << "Failed to copy file " << tgtFilePath;
+            return false;
+        }
+    }
+    return true;
+}