5 files changed, 175 insertions, 26 deletions

diff --git a/components/package/contents/ui/MailViewer.qml b/components/package/contents/ui/MailViewer.qml
index 771c6fa0..c51e2666 100644
--- a/components/package/contents/ui/MailViewer.qml
+++ b/components/package/contents/ui/MailViewer.qml
@@ -1,7 +1,6 @@
 import QtQuick 2.4
 import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
-import QtWebKit 3.0
 
 import org.kube.framework.domain 1.0 as KubeFramework
 
@@ -10,29 +9,18 @@ Item {
     property variant message;
     property string html;
 
-    WebView {
-        id: webview
+    Rectangle {
+        id: rootRectangle
         anchors.fill: parent
-        onNavigationRequested: {
-            // detect URL scheme prefix, most likely an external link
-            var schemaRE = /^\w+:/;
-            if (schemaRE.test(request.url)) {
-                request.action = WebView.AcceptRequest;
-            } else {
-                request.action = WebView.IgnoreRequest;
-                // delegate request.url here
+        ScrollView {
+            id: scrollView
+            anchors.fill: parent
+            MessagePartTree {
+                id: topPartLoader
+                width: rootRectangle.width
+                height: topPartLoader.desiredHeight
             }
         }
-        onLoadingChanged: {
-            console.warn("Error is ", loadRequest.errorString);
-            console.warn("Status is ", loadRequest.status);
-        }
-    }
-
-    onHtmlChanged: {
-        // console.warn("HTML is ", html);
-        // The file:/// argument is necessary so local icons are found
-        webview.loadHtml(html, "file:///");
     }
 
     KubeFramework.MessageParser {
diff --git a/framework/domain/messageparser.cpp b/framework/domain/messageparser.cpp
index 7089e2d8..cdaf9db4 100644
--- a/framework/domain/messageparser.cpp
+++ b/framework/domain/messageparser.cpp
@@ -26,9 +26,117 @@
 #include <QImage>
 #include <QDebug>
 #include <QTime>
+#include <QUrl>
 #include <MimeTreeParser/ObjectTreeParser>
 #include <MimeTreeParser/MessagePart>
 
+PartModel::PartModel(QSharedPointer<MimeTreeParser::MessagePart> partTree, QMap<QByteArray, QUrl> embeddedPartMap) : mPartTree(partTree), mEmbeddedPartMap(embeddedPartMap)
+{
+}
+
+QHash<int, QByteArray> PartModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles[Text] = "text";
+    roles[IsHtml] = "isHtml";
+    roles[IsEncrypted] = "isEncrypted";
+    roles[IsAttachment] = "isAttachment";
+    roles[HasContent] = "hasContent";
+    roles[Type] = "type";
+    return roles;
+}
+
+QModelIndex PartModel::index(int row, int column, const QModelIndex &parent) const
+{
+    // qDebug() << "index " << parent << row << column << mPartTree->messageParts().size();
+    if (!parent.isValid()) {
+        if (row < mPartTree->messageParts().size()) {
+            auto part = mPartTree->messageParts().at(row);
+            return createIndex(row, column, part.data());
+        }
+    } else {
+        auto part = static_cast<MimeTreeParser::MessagePart*>(parent.internalPointer());
+        auto subPart = part->messageParts().at(row);
+        return createIndex(row, column, subPart.data());
+    }
+    return QModelIndex();
+}
+
+QVariant PartModel::data(const QModelIndex &index, int role) const
+{
+    // qDebug() << "Getting data for index";
+    if (index.isValid()) {
+        auto part = static_cast<MimeTreeParser::MessagePart*>(index.internalPointer());
+        switch (role) {
+            case Text: {
+                // qDebug() << "Getting text: " << part->property("text").toString();
+                // FIXME: we should have a list per part, and not one for all parts.
+                auto text = part->property("htmlContent").toString();
+                for (const auto &cid : mEmbeddedPartMap.keys()) {
+                    text.replace(QString("src=\"cid:%1\"").arg(QString(cid)), QString("src=\"%1\"").arg(mEmbeddedPartMap.value(cid).toString()));
+                }
+                return text;
+            }
+            case IsAttachment:
+                return part->property("attachment").toBool();
+            case IsEncrypted:
+                return part->property("isEncrypted").toBool();
+            case IsHtml:
+                return part->property("isHtml").toBool();
+            case HasContent:
+                return !part->property("htmlContent").toString().isEmpty();
+            case Type:
+                return part->metaObject()->className();
+        }
+    }
+    return QVariant();
+}
+
+QModelIndex PartModel::parent(const QModelIndex &index) const
+{
+    // qDebug() << "parent " << index;
+    if (index.isValid()) {
+        auto part = static_cast<MimeTreeParser::MessagePart*>(index.internalPointer());
+        auto parentPart = static_cast<MimeTreeParser::MessagePart*>(part->parentPart());
+        auto row = 0;//get the parents parent to find the index
+        if (!parentPart) {
+            parentPart = mPartTree.data();
+        }
+        int i = 0;
+        for (const auto &p : parentPart->messageParts()) {
+            if (p.data() == part) {
+                row = i;
+                break;
+            }
+            i++;
+        }
+        return createIndex(row, index.column(), parentPart);
+    }
+    return QModelIndex();
+}
+
+int PartModel::rowCount(const QModelIndex &parent) const
+{
+    // qDebug() << "Row count " << parent;
+    if (!parent.isValid()) {
+        // qDebug() << "Row count " << mPartTree->messageParts().size();
+        return mPartTree->messageParts().size();
+    } else {
+        auto part = static_cast<MimeTreeParser::MessagePart*>(parent.internalPointer());
+        if (part) {
+            return part->messageParts().size();
+        }
+    }
+    return 0;
+}
+
+int PartModel::columnCount(const QModelIndex &parent) const
+{
+    // qDebug() << "Column count " << parent;
+    return 1;
+}
+
+
 MessageParser::MessageParser(QObject *parent)
     : QObject(parent)
 {
@@ -64,20 +172,29 @@ void MessageParser::setMessage(const QVariant &message)
     ObjectTreeSource source(&htmlWriter, &cssHelper);
     MimeTreeParser::ObjectTreeParser otp(&source, mNodeHelper.get());
 
-    const auto partTree = otp.parseToTree(msg.data()).dynamicCast<MimeTreeParser::MessagePartList>();
+    mPartTree = otp.parseToTree(msg.data()).dynamicCast<MimeTreeParser::MessagePart>();
 
     htmlWriter.begin(QString());
     htmlWriter.queue(cssHelper.htmlHead(false));
 
-    if (partTree) {
-        partTree->fix();
-        partTree->copyContentFrom();
-        partTree->html(false);
+    if (mPartTree) {
+        mPartTree->fix();
+        mPartTree->copyContentFrom();
+        mPartTree->html(false);
     }
 
     htmlWriter.queue(QStringLiteral("</body></html>"));
     htmlWriter.end();
 
+    mEmbeddedPartMap = htmlWriter.embeddedParts();
     mHtml = htmlWriter.html();
     emit htmlChanged();
 }
+
+QAbstractItemModel *MessageParser::partTree() const
+{
+    qDebug() << "Getting partTree";
+    qDebug() << "Row count " << mPartTree->messageParts().size();
+    return new PartModel(mPartTree, mEmbeddedPartMap);
+}
+
diff --git a/framework/domain/messageparser.h b/framework/domain/messageparser.h
index 72b55a5a..ac14fad9 100644
--- a/framework/domain/messageparser.h
+++ b/framework/domain/messageparser.h
@@ -22,17 +22,24 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
+
+#include <QAbstractItemModel>
+#include <QModelIndex>
+
 #include <memory>
+#include <MimeTreeParser/MessagePart>
 
 namespace MimeTreeParser {
     class NodeHelper;
 };
+class QAbstractItemModel;
 
 class MessageParser : public QObject
 {
     Q_OBJECT
     Q_PROPERTY (QVariant message READ message WRITE setMessage)
     Q_PROPERTY (QString html READ html NOTIFY htmlChanged)
+    Q_PROPERTY (QAbstractItemModel* partTree READ partTree NOTIFY htmlChanged)
 
 public:
     explicit MessageParser(QObject *parent = Q_NULLPTR);
@@ -41,11 +48,42 @@ public:
 
     QVariant message() const;
     void setMessage(const QVariant &to);
+    QAbstractItemModel *partTree() const;
 
 signals:
     void htmlChanged();
 
 private:
+    QSharedPointer<MimeTreeParser::MessagePart> mPartTree;
     QString mHtml;
+    QMap<QByteArray, QUrl> mEmbeddedPartMap;
     std::shared_ptr<MimeTreeParser::NodeHelper> mNodeHelper;
 };
+
+class PartModel : public QAbstractItemModel {
+    Q_OBJECT
+public:
+    PartModel(QSharedPointer<MimeTreeParser::MessagePart> partTree, QMap<QByteArray, QUrl> embeddedPartMap);
+
+public:
+    enum Roles {
+        Text  = Qt::UserRole + 1,
+        IsHtml,
+        IsEncrypted,
+        IsAttachment,
+        HasContent,
+        Type
+    };
+
+    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+    QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+
+private:
+    QSharedPointer<MimeTreeParser::MessagePart> mPartTree;
+    QMap<QByteArray, QUrl> mEmbeddedPartMap;
+};
+
diff --git a/framework/domain/stringhtmlwriter.cpp b/framework/domain/stringhtmlwriter.cpp
index b65c992f..88034492 100644
--- a/framework/domain/stringhtmlwriter.cpp
+++ b/framework/domain/stringhtmlwriter.cpp
@@ -136,6 +136,11 @@ void StringHtmlWriter::insertExtraHead()
     }
 }
 
+QMap<QByteArray, QUrl> StringHtmlWriter::embeddedParts() const
+{
+    return mEmbeddedPartMap;
+}
+
 QString StringHtmlWriter::html() const
 {
     if (mState != Ended) {
diff --git a/framework/domain/stringhtmlwriter.h b/framework/domain/stringhtmlwriter.h
index c1410d57..fa5b760e 100644
--- a/framework/domain/stringhtmlwriter.h
+++ b/framework/domain/stringhtmlwriter.h
@@ -53,6 +53,7 @@ public:
     void extraHead(const QString &str) Q_DECL_OVERRIDE;
 
     QString html() const;
+    QMap<QByteArray, QUrl> embeddedParts() const;
 private:
     void insertExtraHead();
     void resolveCidUrls();