Show message body instead of raw.

mimetic is used which is likely to be substituted with something more
flexible soon

Author: sshilovsky

MessageViewer.qml

@@ -1,16 +1,18 @@
 import QtQuick 2.0
 import QtQuick.Controls 1.2
+import Notquick 1.0
 
 Rectangle {
     id: root
     property var message
+    property var entity: message.createMimeEntity()
 
     color: "red"
 
     TextArea {
         readOnly: true
         anchors.fill: parent
-        text: message.raw
+        text: entity.body
     }
 
 }

main.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import Notmuch 1.0
+import Notquick 1.0
 import QtQuick.Controls 1.0
 
 ApplicationWindow {
@@ -33,7 +33,6 @@ ApplicationWindow {
             function updateThreads() { // this is done to implement refreshing on 'Go' click
                 threadList.model = 0
                 threadList.model = NotmuchDatabase.queryThreads(queryString)
-                threadList.updateMessages()
             }
         }
 

notquick.pro

@@ -11,7 +11,9 @@ SOURCES += \
     src/disposable.cpp \
     src/notmuch/tags.cpp \
     src/notmuch/messages.cpp \
-    src/notmuch/message.cpp
+    src/notmuch/message.cpp \
+    src/mime/fileentity.cpp \
+    src/mime/mytest.cpp
 
 RESOURCES += qml.qrc
 
@@ -23,10 +25,12 @@ HEADERS += \
     src/disposable.h \
     src/notmuch/tags.h \
     src/notmuch/messages.h \
-    src/notmuch/message.h
+    src/notmuch/message.h \
+    src/mime/fileentity.h \
+    src/mime/mytest.h
 
 INCLUDEPATH += src/
 
-LIBS += -lnotmuch
+LIBS += -lnotmuch -lmimetic
 
 OTHER_FILES +=

src/main.cpp

@@ -5,10 +5,10 @@
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 
-#include "src/notmuch/thread.h"
-#include "src/notmuch/threads.h"
-#include "src/notmuch/database.h"
-#include "src/notmuch/tags.h"
+
+#include "notmuch/database.h"
+#include "mime/fileentity.h"
+#include "mime/mytest.h"
 
 notmuch::DatabaseProxy *proxy = 0;
 
@@ -24,12 +24,13 @@ int main(int argc, char *argv[])
     db.open();
     proxy = new notmuch::DatabaseProxy(&db); // owned by QML, so GC-ed later
 
-    qmlRegisterSingletonType<notmuch::Database>("Notmuch", 1, 0, "NotmuchDatabase", databaseSingleton);
-    //qmlRegisterType<notmuch::Threads>("Notmuch", 1, 0, "NotmuchThreads");
-    //qmlRegisterType<notmuch::Tags>("Notmuch", 1, 0, "NotmuchTags");
+    qmlRegisterSingletonType<notmuch::Database>("Notquick", 1, 0, "NotmuchDatabase", databaseSingleton);
+    qmlRegisterType<mime::FileEntity>("Notquick", 1, 0, "MimeFileEntity");
+
+    qmlRegisterType<MyTest>("Notquick", 1, 0, "NQTest");
 
-    QApplication app(argc, argv);
-    QQmlApplicationEngine engine;
+    QApplication app(argc, argv); // TODO maybe switch to QGuiApplication
+    QQmlApplicationEngine engine; // TODO maybe switch to QQmlEngine
 
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
 

src/mime/fileentity.cpp

@@ -0,0 +1,32 @@
+#include "fileentity.h"
+#include <QFile>
+#include <QDebug>
+
+#include <fstream>
+
+namespace mime {
+
+QString FileEntity::body() const
+{
+    if(!mimeticEntity)
+        return QString();
+    return QString(mimeticEntity->body().c_str());
+}
+
+FileEntity::FileEntity(QString filename, QObject *parent) :
+    QObject(parent)
+{
+    qDebug() << "opening " << filename;
+    // TODO error messages to qCritical()
+    std::ifstream f(filename.toLocal8Bit().data());
+    mimeticEntity = new mimetic::MimeEntity();
+    mimeticEntity->load(f, mimetic::imChildParts | mimetic::imEpilogue | mimetic::imPreamble);
+}
+
+FileEntity::~FileEntity()
+{
+    if(mimeticEntity)
+        delete mimeticEntity;
+}
+
+} // namespace mail

src/mime/fileentity.h

@@ -0,0 +1,30 @@
+#ifndef MAIL_ENTITY_H
+#define MAIL_ENTITY_H
+
+#include <QObject>
+#include <QFile>
+#include <mimetic/mimeentity.h>
+
+namespace mime {
+
+class FileEntity : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString body READ body CONSTANT)
+
+    QString body() const;
+public:
+    explicit FileEntity(QString filename = QString(), QObject *parent = 0);
+    virtual ~FileEntity();
+
+private:
+    mimetic::MimeEntity* mimeticEntity;
+
+
+
+
+};
+
+} // namespace mail
+
+#endif // MAIL_ENTITY_H

src/mime/mytest.cpp

@@ -0,0 +1,6 @@
+#include "mytest.h"
+
+MyTest::MyTest(QObject *parent) :
+    QObject(parent)
+{
+}

src/mime/mytest.h

@@ -0,0 +1,18 @@
+#ifndef MYTEST_H
+#define MYTEST_H
+
+#include <QObject>
+
+class MyTest : public QObject
+{
+    Q_OBJECT
+public:
+    explicit MyTest(QObject *parent = 0);
+
+signals:
+
+public slots:
+
+};
+
+#endif // MYTEST_H

src/notmuch/message.cpp

@@ -3,6 +3,7 @@
 #include <QTextStream>
 #include <QDebug>
 #include "log.h"
+#include "mime/fileentity.h"
 
 namespace notmuch {
 
@@ -27,6 +28,11 @@ bool Message::dropTag(QString name)
     return true;
 }
 
+QObject *Message::createMimeEntity() const
+{
+    return new mime::FileEntity(filename(), 0);
+}
+
 QString Message::filename() const
 {
     if(!libnotmuch_message)
@@ -42,16 +48,6 @@ QDateTime Message::date() const
     return datetime;
 }
 
-QString Message::raw() const
-{
-    QFile f(filename());
-    if(!f.open(QFile::ReadOnly|QFile::Text)) {
-        // TODO error message
-    }
-    QTextStream in(&f);
-    return filename() + "\n\n" + in.readAll();
-}
-
 QString Message::id() const
 {
     if(!libnotmuch_message)

src/notmuch/message.h

@@ -17,7 +17,6 @@ class Message : public QObject, protected Disposable
     QString id() const;
     QString filename() const;
     QDateTime date() const;
-    QString raw() const;
     Tags* tags();
 
 public:
@@ -38,10 +37,10 @@ class Message : public QObject, protected Disposable
     Q_PROPERTY(QString from READ from CONSTANT)*/
     Q_PROPERTY(QObject* tags READ tags CONSTANT)
 
-    Q_PROPERTY(QString raw READ raw CONSTANT)
-
     Q_INVOKABLE bool dropTag(QString name);
 
+    Q_INVOKABLE QObject* createMimeEntity() const; // TODO call MimeEntity const. directly from qml
+
 private:
     Message(notmuch_message_t* libnotmuch_message, QObject* parent);
     notmuch_message_t* libnotmuch_message;