4 files changed, 208 insertions, 3 deletions

diff --git a/components/kube/contents/ui/ComposerView.qml b/components/kube/contents/ui/ComposerView.qml
index 49a59024..9e48aba3 100644
--- a/components/kube/contents/ui/ComposerView.qml
+++ b/components/kube/contents/ui/ComposerView.qml
@@ -21,6 +21,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
+import QtQuick.Dialogs 1.0 as Dialogs
 
 import org.kube.framework 1.0 as Kube
 
@@ -253,6 +254,47 @@ Kube.View {
                 onActiveFocusChanged: closeFirstSplitIfNecessary()
             }
 
+            Row {
+                Layout.fillWidth: true
+                spacing: Kube.Units.largeSpacing
+                Flow {
+                    id: attachments
+
+                    layoutDirection: Qt.RightToLeft
+                    spacing: Kube.Units.smallSpacing
+                    clip: true
+
+                    Repeater {
+                        model: composerController.attachmentModel
+                        delegate: Kube.AttachmentDelegate {
+                            name: model.filename
+                            icon: model.iconName
+                            clip: true
+                        }
+                    }
+                }
+                Kube.Button {
+                    text: "Attach file"
+
+                    onClicked: {
+                        fileDialogComponent.createObject(parent)
+                    }
+
+                    Component {
+                        id: fileDialogComponent
+                        Dialogs.FileDialog {
+                            id: fileDialog
+                            visible: true
+                            title: "Choose a file to attach"
+                            selectFolder: false
+                            onAccepted: {
+                                composerController.addAttachment(fileDialog.fileUrl)
+                            }
+                        }
+                    }
+                }
+            }
+
             Kube.TextArea {
                 id: content
                 Layout.fillWidth: true
diff --git a/framework/qmldir b/framework/qmldir
index 1265b68c..74f8a4af 100644
--- a/framework/qmldir
+++ b/framework/qmldir
@@ -26,6 +26,7 @@ TextArea 1.0 TextArea.qml
 Label 1.0 Label.qml
 View 1.0 View.qml
 AutocompleteLineEdit 1.0 AutocompleteLineEdit.qml
+AttachmentDelegate 1.0 AttachmentDelegate.qml
 singleton Messages 1.0 Messages.qml
 singleton Colors 1.0 Colors.qml
 singleton Icons 1.0 Icons.qml
diff --git a/framework/src/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp
index cbc43afe..7c495543 100644
--- a/framework/src/domain/composercontroller.cpp
+++ b/framework/src/domain/composercontroller.cpp
@@ -27,6 +27,10 @@
 #include <QSortFilterProxyModel>
 #include <QList>
 #include <QDebug>
+#include <QMimeDatabase>
+#include <QUrlQuery>
+#include <QFileInfo>
+#include <QFile>
 #include <sink/store.h>
 #include <sink/log.h>
 
@@ -84,8 +88,16 @@ ComposerController::ComposerController()
     mIdentitySelector{new IdentitySelector{*this}},
     mToModel{new QStringListModel},
     mCcModel{new QStringListModel},
-    mBccModel{new QStringListModel}
+    mBccModel{new QStringListModel},
+    mAttachmentModel{new QStandardItemModel}
 {
+    mAttachmentModel->setItemRoleNames({{NameRole, "name"},
+                                        {FilenameRole, "filename"},
+                                        {ContentRole, "content"},
+                                        {MimeTypeRole, "mimetype"},
+                                        {DescriptionRole, "description"},
+                                        {IconNameRole, "iconName"},
+                                        {InlineRole, "inline"}});
     updateSaveAsDraftAction();
     // mSendAction->monitorProperty<To>();
     // mSendAction->monitorProperty<Send>([] (const QString &) -> bool{
@@ -175,6 +187,46 @@ void ComposerController::removeBcc(const QString &s)
     updateSendAction();
 }
 
+QAbstractItemModel *ComposerController::attachmentModel() const
+{
+    return mAttachmentModel.data();
+}
+
+void ComposerController::addAttachment(const QUrl &url)
+{
+    QMimeDatabase db;
+    auto mimeType = db.mimeTypeForUrl(url);
+    if (mimeType.name() == QLatin1String("inode/directory")) {
+        qWarning() << "Can't deal with directories yet.";
+    } else {
+        if (!url.isLocalFile()) {
+            qWarning() << "Cannot attach remote file: " << url;
+            return;
+        }
+
+        QFileInfo fileInfo(url.toLocalFile());
+        if (!fileInfo.exists()) {
+            qWarning() << "The file doesn't exist: " << url;
+        }
+
+        QFile file{fileInfo.filePath()};
+        file.open(QIODevice::ReadOnly);
+        const auto data = file.readAll();
+        auto item = new QStandardItem;
+        item->setData(fileInfo.fileName(), NameRole);
+        item->setData(mimeType.name().toLatin1(), MimeTypeRole);
+        item->setData(fileInfo.fileName(), FilenameRole);
+        item->setData(false, InlineRole);
+        item->setData(mimeType.iconName(), IconNameRole);
+        item->setData(data, ContentRole);
+        mAttachmentModel->appendRow(item);
+    }
+}
+
+void ComposerController::removeAttachment(const QString &s)
+{
+}
+
 Completer *ComposerController::recipientCompleter() const
 {
     return mRecipientCompleter.data();
@@ -215,6 +267,56 @@ static QStringList getStringListFromAddresses(const QString &s)
     return list;
 }
 
+void ComposerController::addAttachmentPart(KMime::Content *partToAttach)
+{
+    auto item = new QStandardItem;
+
+    if (partToAttach->contentType()->mimeType() == "multipart/digest" ||
+            partToAttach->contentType()->mimeType() == "message/rfc822") {
+        // if it is a digest or a full message, use the encodedContent() of the attachment,
+        // which already has the proper headers
+        item->setData(partToAttach->encodedContent(), ContentRole);
+    } else {
+        item->setData(partToAttach->decodedContent(), ContentRole);
+    }
+    item->setData(partToAttach->contentType()->mimeType(), MimeTypeRole);
+
+    QMimeDatabase db;
+    auto mimeType = db.mimeTypeForName(partToAttach->contentType()->mimeType());
+    item->setData(mimeType.iconName(), IconNameRole);
+
+    if (partToAttach->contentDescription(false)) {
+        item->setData(partToAttach->contentDescription()->asUnicodeString(), DescriptionRole);
+    }
+    QString name;
+    QString filename;
+    if (partToAttach->contentType(false)) {
+        if (partToAttach->contentType()->hasParameter(QStringLiteral("name"))) {
+            name = partToAttach->contentType()->parameter(QStringLiteral("name"));
+        }
+    }
+    if (partToAttach->contentDisposition(false)) {
+        filename = partToAttach->contentDisposition()->filename();
+        item->setData(partToAttach->contentDisposition()->disposition() == KMime::Headers::CDinline, InlineRole);
+    }
+
+    if (name.isEmpty() && !filename.isEmpty()) {
+        name = filename;
+    }
+    if (filename.isEmpty() && !name.isEmpty()) {
+        filename = name;
+    }
+
+    if (!filename.isEmpty()) {
+        item->setData(filename, FilenameRole);
+    }
+    if (!name.isEmpty()) {
+        item->setData(name, NameRole);
+    }
+
+    mAttachmentModel->appendRow(item);
+}
+
 void ComposerController::setMessage(const KMime::Message::Ptr &msg)
 {
     mToModel->setStringList(getStringListFromAddresses(msg->to(true)->asUnicodeString()));
@@ -223,6 +325,12 @@ void ComposerController::setMessage(const KMime::Message::Ptr &msg)
 
     setSubject(msg->subject(true)->asUnicodeString());
     setBody(msg->body());
+
+    //TODO use ObjecTreeParser to get encrypted attachments as well
+    foreach (const auto &att, msg->attachments()) {
+        addAttachmentPart(att);
+    }
+
     setExistingMessage(msg);
 }
 
@@ -236,7 +344,6 @@ void ComposerController::loadMessage(const QVariant &message, bool loadAsDraft)
     Store::fetchOne<Mail>(query).then([this, loadAsDraft](const Mail &mail) {
         setExistingMail(mail);
 
-        //TODO this should probably happen as reaction to the property being set.
         const auto mailData = KMime::CRLFtoLF(mail.getMimeMessage());
         if (!mailData.isEmpty()) {
             KMime::Message::Ptr mail(new KMime::Message);
@@ -285,7 +392,6 @@ KMime::Message::Ptr ComposerController::assembleMessage()
     mail->from(true)->addAddress(getIdentity());
 
     mail->subject(true)->fromUnicodeString(getSubject(), "utf-8");
-    mail->setBody(getBody().toUtf8());
     if (!mail->messageID()) {
         mail->messageID(true)->generate("org.kde.kube");
     }
@@ -293,6 +399,45 @@ KMime::Message::Ptr ComposerController::assembleMessage()
         mail->date(true)->setDateTime(QDateTime::currentDateTimeUtc());
     }
 
+    auto root = mAttachmentModel->invisibleRootItem();
+    if (root->hasChildren()) {
+        mail->contentType(true)->setMimeType("multipart/mixed");
+        mail->contentType()->setBoundary(KMime::multiPartBoundary());
+        mail->contentTransferEncoding()->setEncoding(KMime::Headers::CE7Bit);
+        mail->setPreamble("This is a multi-part message in MIME format.\n");
+        for (int row = 0; row < root->rowCount(); row++) {
+            auto item = root->child(row, 0);
+            const auto name = item->data(NameRole).toString();
+            const auto filename = item->data(FilenameRole).toString();
+            const auto mimeType = item->data(MimeTypeRole).toByteArray();
+            const auto isInline = item->data(InlineRole).toBool();
+            const auto content = item->data(ContentRole).toByteArray();
+
+            KMime::Content *part = new KMime::Content;
+            part->contentDisposition(true)->setFilename(filename);
+            if (isInline) {
+                part->contentDisposition(true)->setDisposition(KMime::Headers::CDinline);
+            } else {
+                part->contentDisposition(true)->setDisposition(KMime::Headers::CDattachment);
+            }
+            part->contentType(true)->setMimeType(mimeType);
+            part->contentType(true)->setName(name, "utf-8");
+            //Just always encode attachments base64 so it's safe for binary data
+            part->contentTransferEncoding(true)->setEncoding(KMime::Headers::CEbase64);
+            part->setBody(content);
+
+            mail->addContent(part);
+
+            auto mainMessage = new KMime::Content;
+            mainMessage->setBody(getBody().toUtf8());
+            mainMessage->contentType(true)->setMimeType("text/plain");
+            mail->addContent(mainMessage);
+        }
+    } else {
+        //FIXME same implementation as above for attachments
+        mail->setBody(getBody().toUtf8());
+    }
+
     mail->assemble();
     return mail;
 }
diff --git a/framework/src/domain/composercontroller.h b/framework/src/domain/composercontroller.h
index 87349d0c..de154b66 100644
--- a/framework/src/domain/composercontroller.h
+++ b/framework/src/domain/composercontroller.h
@@ -24,6 +24,7 @@
 #include <QString>
 #include <QStringList>
 #include <QStringListModel>
+#include <QStandardItemModel>
 #include <QVariant>
 #include <sink/applicationdomaintype.h>
 #include <KMime/Message>
@@ -66,6 +67,7 @@ class ComposerController : public Kube::Controller
     Q_PROPERTY (QAbstractItemModel* toModel READ toModel CONSTANT)
     Q_PROPERTY (QAbstractItemModel* ccModel READ ccModel CONSTANT)
     Q_PROPERTY (QAbstractItemModel* bccModel READ bccModel CONSTANT)
+    Q_PROPERTY (QAbstractItemModel* attachmentModel READ attachmentModel CONSTANT)
 
     KUBE_CONTROLLER_ACTION(send)
     KUBE_CONTROLLER_ACTION(saveAsDraft)
@@ -81,6 +83,7 @@ public:
     QAbstractItemModel *toModel() const;
     QAbstractItemModel *ccModel() const;
     QAbstractItemModel *bccModel() const;
+    QAbstractItemModel *attachmentModel() const;
 
     Q_INVOKABLE void addTo(const QString &);
     Q_INVOKABLE void removeTo(const QString &);
@@ -88,6 +91,8 @@ public:
     Q_INVOKABLE void removeCc(const QString &);
     Q_INVOKABLE void addBcc(const QString &);
     Q_INVOKABLE void removeBcc(const QString &);
+    Q_INVOKABLE void addAttachment(const QUrl &);
+    Q_INVOKABLE void removeAttachment(const QString &);
 
 public slots:
     virtual void clear() Q_DECL_OVERRIDE;
@@ -97,8 +102,19 @@ private slots:
     void updateSaveAsDraftAction();
 
 private:
+    enum AttachmentRoles {
+        NameRole = Qt::UserRole + 1,
+        FilenameRole,
+        ContentRole,
+        MimeTypeRole,
+        DescriptionRole,
+        InlineRole,
+        IconNameRole
+    };
+
     void recordForAutocompletion(const QByteArray &addrSpec, const QByteArray &displayName);
     void setMessage(const QSharedPointer<KMime::Message> &msg);
+    void addAttachmentPart(KMime::Content *partToAttach);
     KMime::Message::Ptr assembleMessage();
 
     QScopedPointer<Completer> mRecipientCompleter;
@@ -106,4 +122,5 @@ private:
     QScopedPointer<QStringListModel> mToModel;
     QScopedPointer<QStringListModel> mCcModel;
     QScopedPointer<QStringListModel> mBccModel;
+    QScopedPointer<QStandardItemModel> mAttachmentModel;
 };