6 files changed, 217 insertions, 4 deletions

diff --git a/components/package/contents/ui/MailViewer.qml b/components/package/contents/ui/MailViewer.qml
index 2c45a49f..01163277 100644
--- a/components/package/contents/ui/MailViewer.qml
+++ b/components/package/contents/ui/MailViewer.qml
@@ -28,7 +28,7 @@ Item {
     id: root
     property variant message;
     property string html;
-    property int desiredHeight: topPartLoader.height + newMailViewer.height + 5
+    property int desiredHeight: topPartLoader.height + newMailViewer.height + attachments.height + mailStructure.height + 5
 
     clip: true
 
@@ -55,9 +55,46 @@ Item {
         width: topPartLoader.contentWidth >= parent.width ? topPartLoader.contentWidth : parent.width
     }
 
+    //END old mail viewer
+
+    TreeView {
+        id: attachments
+        anchors.top: newMailViewer.bottom
+        visible: messageParser.attachments.rowCount() > 0
+        width: parent.width
+        height: 200
+        TableViewColumn {
+            role: "name"
+            title: "Filename"
+            width: 300
+        }
+        TableViewColumn {
+            role: "type"
+            title: "Type"
+            width: 60
+        }
+        TableViewColumn {
+            role: "size"
+            title: "Size"
+            width: 60
+        }
+        TableViewColumn {
+            role: "encrypted"
+            title: "Encrypted"
+            width: 60
+        }
+        TableViewColumn {
+            role: "signed"
+            title: "Signed"
+            width: 60
+        }
+        model: messageParser.attachments
+    }
+
     TreeView {
         id: mailStructure
         visible: false
+        anchors.top: messageParser.attachments.rowCount() > 0 ? attachments.bottom : newMailViewer.bottom
         width: parent.width
         height: 400
         TableViewColumn {
@@ -80,10 +117,8 @@ Item {
             title: "Content"
             width: 200
         }
-        //model: messageParser.partTree
         model: messageParser.newTree
     }
-    //END old mail viewer
 
     KubeFramework.MessageParser {
         id: messageParser
diff --git a/framework/domain/CMakeLists.txt b/framework/domain/CMakeLists.txt
index a31bb016..094eac04 100644
--- a/framework/domain/CMakeLists.txt
+++ b/framework/domain/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(mailplugin_SRCS
+    attachmentmodel.cpp
     mailplugin.cpp
     maillistmodel.cpp
     folderlistmodel.cpp
diff --git a/framework/domain/attachmentmodel.cpp b/framework/domain/attachmentmodel.cpp
new file mode 100644
index 00000000..35e94e2e
--- /dev/null
+++ b/framework/domain/attachmentmodel.cpp
@@ -0,0 +1,141 @@
+/*
+    Copyright (c) 2016 Sandro Knauß <knauss@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "messageparser.h"
+#include "mimetreeparser/interface.h"
+
+#include <QDebug>
+
+QString sizeHuman(const Content::Ptr &content)
+{
+    float num = content->content().size();
+    QStringList list;
+    list << "KB" << "MB" << "GB" << "TB";
+
+    QStringListIterator i(list);
+    QString unit("Bytes");
+
+    while(num >= 1024.0 && i.hasNext())
+     {
+        unit = i.next();
+        num /= 1024.0;
+    }
+    
+    if (unit == "Bytes") {
+        return QString().setNum(num) + " " + unit;
+    } else {
+        return QString().setNum(num,'f',2)+" "+unit;
+    }
+}
+
+class AttachmentModelPrivate
+{
+public:
+    AttachmentModelPrivate(AttachmentModel *q_ptr, const std::shared_ptr<Parser> &parser);
+
+    AttachmentModel *q;
+    std::shared_ptr<Parser> mParser;
+    QVector<Part::Ptr> mAttachments;
+};
+
+AttachmentModelPrivate::AttachmentModelPrivate(AttachmentModel* q_ptr, const std::shared_ptr<Parser>& parser)
+    : q(q_ptr)
+    , mParser(parser)
+{
+    mAttachments = mParser->collectAttachmentParts();
+}
+
+AttachmentModel::AttachmentModel(std::shared_ptr<Parser> parser)
+    : d(std::unique_ptr<AttachmentModelPrivate>(new AttachmentModelPrivate(this, parser)))
+{
+}
+
+AttachmentModel::~AttachmentModel()
+{
+}
+
+QHash<int, QByteArray> AttachmentModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles[TypeRole] = "type";
+    roles[NameRole] = "name";
+    roles[SizeRole] = "size";
+    roles[IsEncryptedRole] = "encrypted";
+    roles[IsSignedRole] = "signed";
+    return roles;
+}
+
+QModelIndex AttachmentModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (row < 0 || column != 0) {
+        return QModelIndex();
+    }
+
+    if (row < d->mAttachments.size()) {
+        return createIndex(row, column, d->mAttachments.at(row).get());
+    }
+    return QModelIndex();
+}
+
+QVariant AttachmentModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid()) {
+        switch (role) {
+        case Qt::DisplayRole:
+            return QString("root");
+        }
+        return QVariant();
+    }
+
+    if (index.internalPointer()) {
+        const auto entry = static_cast<Part *>(index.internalPointer());
+        const auto content = entry->content().at(0);
+        switch(role) {
+        case TypeRole:
+            return content->mailMime()->mimetype().name();
+        case NameRole:
+            return entry->mailMime()->filename();
+        case SizeRole:
+            return sizeHuman(content);
+        case IsEncryptedRole:
+            return content->encryptions().size() > 0;
+        case IsSignedRole:
+            return content->signatures().size() > 0;
+        }
+    }
+    return QVariant();
+}
+
+QModelIndex AttachmentModel::parent(const QModelIndex &index) const
+{
+    return QModelIndex();
+}
+
+int AttachmentModel::rowCount(const QModelIndex &parent) const
+{
+    if (!parent.isValid()) {
+        return d->mAttachments.size();
+    }
+    return 0;
+}
+
+int AttachmentModel::columnCount(const QModelIndex &parent) const
+{
+    return 1;
+}
diff --git a/framework/domain/messageparser.cpp b/framework/domain/messageparser.cpp
index ec79d50b..2b8d3afe 100644
--- a/framework/domain/messageparser.cpp
+++ b/framework/domain/messageparser.cpp
@@ -105,3 +105,10 @@ QAbstractItemModel *MessageParser::newTree() const
     new ModelTest(model, model);
     return model;
 }
+
+QAbstractItemModel *MessageParser::attachments() const
+{
+    const auto model = new AttachmentModel(d->mParser);
+    new ModelTest(model, model);
+    return model;
+}
diff --git a/framework/domain/messageparser.h b/framework/domain/messageparser.h
index 559fa6f9..203f7576 100644
--- a/framework/domain/messageparser.h
+++ b/framework/domain/messageparser.h
@@ -41,6 +41,7 @@ typedef std::shared_ptr<Content> ContentPtr;
 class MessagePartPrivate;
 
 class NewModelPrivate;
+class AttachmentModelPrivate;
 
 class MessageParser : public QObject
 {
@@ -49,6 +50,7 @@ class MessageParser : public QObject
     Q_PROPERTY (QString html READ html NOTIFY htmlChanged)
     Q_PROPERTY (QAbstractItemModel* partTree READ partTree NOTIFY htmlChanged)
     Q_PROPERTY (QAbstractItemModel* newTree READ newTree NOTIFY htmlChanged)
+    Q_PROPERTY (QAbstractItemModel* attachments READ attachments NOTIFY htmlChanged)
 
 public:
     explicit MessageParser(QObject *parent = Q_NULLPTR);
@@ -60,6 +62,7 @@ public:
     void setMessage(const QVariant &to);
     QAbstractItemModel *partTree() const;
     QAbstractItemModel *newTree() const;
+    QAbstractItemModel *attachments() const;
 
 signals:
     void htmlChanged();
@@ -124,3 +127,28 @@ private:
     std::unique_ptr<NewModelPrivate> d;
 };
 
+class AttachmentModel : public QAbstractItemModel {
+     Q_OBJECT
+public:
+    AttachmentModel(std::shared_ptr<Parser> parser);
+    ~AttachmentModel();
+
+public:
+    enum Roles {
+        TypeRole  = Qt::UserRole + 1,
+        NameRole,
+        SizeRole,
+        IsEncryptedRole,
+        IsSignedRole
+    };
+
+    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:
+    std::unique_ptr<AttachmentModelPrivate> d;
+};
diff --git a/framework/domain/messageparser_new.cpp b/framework/domain/messageparser_new.cpp
index b930f33d..8afd5956 100644
--- a/framework/domain/messageparser_new.cpp
+++ b/framework/domain/messageparser_new.cpp
@@ -1,5 +1,6 @@
-
 /*
+    Copyright (c) 2016 Sandro Knauß <knauss@kolabsys.com>
+
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your