4 files changed, 98 insertions, 42 deletions

diff --git a/framework/domain/mimetreeparser/interface.cpp b/framework/domain/mimetreeparser/interface.cpp
index 6a399015..c239fcc0 100644
--- a/framework/domain/mimetreeparser/interface.cpp
+++ b/framework/domain/mimetreeparser/interface.cpp
@@ -38,26 +38,27 @@ public:
 
     QVector<Part::Ptr> subParts();
 
-    const std::weak_ptr<Part> &parent() const;
+    Part *parent() const;
 private:
     Part *q;
-    std::weak_ptr<Part> mParent;
+    Part *mParent;
     QVector<Part::Ptr> mSubParts;
 };
 
 PartPrivate::PartPrivate(Part* part)
-    :q(part)
+    : q(part)
+    , mParent(Q_NULLPTR)
 {
 
 }
 
 void PartPrivate::appendSubPart(Part::Ptr subpart)
 {
-    subpart->d->mParent = Part::Ptr(q);
+    subpart->d->mParent = q;
     mSubParts.append(subpart);
 }
 
-const std::weak_ptr<Part> &PartPrivate::parent() const
+Part *PartPrivate::parent() const
 {
     return mParent;
 }
@@ -90,7 +91,7 @@ QByteArray Part::type() const
 
 QVector<Encryption> Part::encryptions() const
 {
-    auto parent = d->parent().lock();
+    auto parent = d->parent();
     if (parent) {
         return parent->encryptions();
     } else {
@@ -100,7 +101,7 @@ QVector<Encryption> Part::encryptions() const
 
 QVector<Signature> Part::signatures() const
 {
-    auto parent = d->parent().lock();
+    auto parent = d->parent();
     if (parent) {
         return parent->signatures();
     } else {
@@ -146,6 +147,16 @@ QVector< Signature > Content::signatures() const
     return QVector<Signature>();
 }
 
+QByteArray Content::content() const
+{
+    return d->mContent;
+}
+
+QByteArray Content::charset() const
+{
+    return d->mCodec;
+}
+
 class ContentPartPrivate
 {
 public:
@@ -153,12 +164,14 @@ public:
     void fillFrom(MimeTreeParser::HtmlMessagePart::Ptr part);
     void fillFrom(MimeTreeParser::AlternativeMessagePart::Ptr part);
 
-    QVector<Content::Ptr> contents() const;
+    QVector<Content::Ptr> content() const;
 
     ContentPart *q;
+
+    ContentPart::Types types() const;
     
 private:
-    QVector<Content::Ptr> mContents;
+    QVector<Content::Ptr> mContent;
     ContentPart::Types mTypes;
 };
 
@@ -167,7 +180,7 @@ void ContentPartPrivate::fillFrom(MimeTreeParser::TextMessagePart::Ptr part)
     mTypes = ContentPart::PlainText;
     foreach (const auto &mp, part->subParts()) {
         auto content = std::make_shared<Content>(mp->text().toLocal8Bit(), q);
-        mContents.append(content);
+        mContent.append(content);
     }
 }
 
@@ -181,6 +194,22 @@ void ContentPartPrivate::fillFrom(MimeTreeParser::AlternativeMessagePart::Ptr pa
     mTypes = ContentPart::Html | ContentPart::PlainText;
 }
 
+ContentPart::Types ContentPartPrivate::types() const
+{
+    return mTypes;
+}
+
+QVector<Content::Ptr> ContentPartPrivate::content() const
+{
+    return mContent;
+}
+
+QVector<Content::Ptr> ContentPart::content(ContentPart::Type ct) const
+{
+    return d->content();
+}
+
+
 ContentPart::ContentPart()
     : d(std::unique_ptr<ContentPartPrivate>(new ContentPartPrivate))
 {
@@ -197,6 +226,11 @@ QByteArray ContentPart::type() const
     return "ContentPart";
 }
 
+ContentPart::Types ContentPart::availableContents() const
+{
+    return d->types();
+}
+
 class MimePartPrivate
 {
 public:
@@ -230,7 +264,7 @@ public:
     ParserPrivate(Parser *parser);
 
     void setMessage(const QByteArray &mimeMessage);
-    void createTree(MimeTreeParser::MessagePart::Ptr start, Part::Ptr tree);
+    void createTree(const MimeTreeParser::MessagePart::Ptr& start, const Part::Ptr& tree);
 
     Part::Ptr mTree;
 private:
@@ -273,9 +307,8 @@ void ParserPrivate::setMessage(const QByteArray& mimeMessage)
 }
 
 
-void ParserPrivate::createTree(MimeTreeParser::MessagePart::Ptr start, Part::Ptr tree)
+void ParserPrivate::createTree(const MimeTreeParser::MessagePart::Ptr &start, const Part::Ptr &tree)
 {
-
     foreach (const auto &mp, start->subParts()) {
         const auto m = mp.dynamicCast<MimeTreeParser::MessagePart>();
         const auto text = mp.dynamicCast<MimeTreeParser::TextMessagePart>();
@@ -316,16 +349,10 @@ Parser::~Parser()
 
 ContentPart::Ptr Parser::collectContentPart(const Part::Ptr &start) const
 {
-    foreach (const auto &part, start->subParts()) {
-        if (part->type() == "ContentPart") {
-            return std::dynamic_pointer_cast<ContentPart>(part);
-        } else {
-            auto ret = collectContentPart(part);
-            if (ret) {
-                return ret;
-            }
-        }
-    }
+    const auto ret = collect<ContentPart>(start,  [](const Part::Ptr &p){return p->type() == "ContentPart";}, [](const ContentPart::Ptr &p){return true;});
+    if (ret.size() > 0) {
+        return ret[0];
+    };
     return ContentPart::Ptr();
 }
 
@@ -333,3 +360,19 @@ ContentPart::Ptr Parser::collectContentPart() const
 {
     return collectContentPart(d->mTree);
 }
+
+template <typename T>
+QVector<typename T::Ptr> Parser::collect(const Part::Ptr &start, std::function<bool(const Part::Ptr &)> select, std::function<bool(const typename T::Ptr &)> filter) const
+{
+    QVector<typename T::Ptr> ret;
+    foreach (const auto &part, start->subParts()) {
+        if (select(part)){
+            const auto p = std::dynamic_pointer_cast<T>(part);
+            if (p && filter(p)) {
+                ret.append(p);
+            }
+            ret += collect<T>(part, select, filter);
+        }
+    }
+    return ret;
+}
diff --git a/framework/domain/mimetreeparser/interface.h b/framework/domain/mimetreeparser/interface.h
index 82f88e73..8a0047ff 100644
--- a/framework/domain/mimetreeparser/interface.h
+++ b/framework/domain/mimetreeparser/interface.h
@@ -66,7 +66,7 @@ public:
 
     bool hasSubParts() const;
     QVector<Part::Ptr> subParts() const;
-    Part::Ptr parent() const;
+    Part *parent() const;
 
     virtual QVector<Signature> signatures() const;
     virtual QVector<Encryption> encryptions() const;
@@ -85,6 +85,8 @@ public:
 
     QByteArray content() const;
 
+    QByteArray charset() const;
+
     //Use default charset
     QString encodedContent() const;
 
@@ -162,8 +164,8 @@ public:
 
     ContentPart();
     virtual ~ContentPart();
-    
-    QVector<Content> content(Type ct) const;
+
+    QVector<Content::Ptr> content(Type ct) const;
 
     Types availableContents() const;
 
@@ -259,7 +261,6 @@ private:
     std::unique_ptr<CertPartPrivate> d;    
 };
 
-
 class Key
 {
     QString keyid() const;
@@ -309,7 +310,7 @@ public:
 
     Part::Ptr getPart(QUrl url);
 
-    //template <typename T> QVector<T::Ptr> collect<T>(Part start, std::function<bool(const Part &)> select, std::function<bool(const T::Ptr &)> filter) const;
+    template <typename T> QVector<typename T::Ptr> collect(const Part::Ptr &start, std::function<bool(const Part::Ptr &)> select, std::function<bool(const typename T::Ptr &)> filter) const;
     QVector<AttachmentPart::Ptr> collectAttachments(Part::Ptr start, std::function<bool(const Part::Ptr &)> select, std::function<bool(const AttachmentPart::Ptr &)> filter) const;
     ContentPart::Ptr collectContentPart(Part::Ptr start, std::function<bool(const Part::Ptr &)> select, std::function<bool(const ContentPart::Ptr &)> filter) const;
     ContentPart::Ptr collectContentPart(const Part::Ptr& start) const;
@@ -324,4 +325,5 @@ signals:
 
 private:
     std::unique_ptr<ParserPrivate> d;
-};
\ No newline at end of file
+};
+
diff --git a/framework/domain/mimetreeparser/tests/data/html.mbox b/framework/domain/mimetreeparser/tests/data/html.mbox
index eebd4283..d476a8d4 100644
--- a/framework/domain/mimetreeparser/tests/data/html.mbox
+++ b/framework/domain/mimetreeparser/tests/data/html.mbox
@@ -9,16 +9,6 @@ X-KMail-Drafts: 7
 X-KMail-Templates: 9
 User-Agent: KMail/4.6 beta5 (Linux/2.6.34.7-0.7-desktop; KDE/4.6.41; x86_64; git-0269848; 2011-04-19)
 MIME-Version: 1.0
-Content-Type: multipart/alternative; boundary="nextPart8606278.tpV19BTJKu"
-Content-Transfer-Encoding: 7Bit
-
-
---nextPart8606278.tpV19BTJKu
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="windows-1252"
-
-Some HTML text
---nextPart8606278.tpV19BTJKu
 Content-Transfer-Encoding: 7Bit
 Content-Type: text/html; charset="windows-1252"
 
@@ -27,5 +17,3 @@ Content-Type: text/html; charset="windows-1252"
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">Some <span style=" font-weight:600;">HTML</span> text</p></body></html>
---nextPart8606278.tpV19BTJKu--
-
diff --git a/framework/domain/mimetreeparser/tests/interfacetest.cpp b/framework/domain/mimetreeparser/tests/interfacetest.cpp
index 1e8c5302..fd828960 100644
--- a/framework/domain/mimetreeparser/tests/interfacetest.cpp
+++ b/framework/domain/mimetreeparser/tests/interfacetest.cpp
@@ -39,7 +39,30 @@ private slots:
     {
         Parser parser(readMailFromFile("plaintext.mbox"));
         auto contentPart = parser.collectContentPart();
-        //QVERIFY((bool)contentPart);
+        QVERIFY((bool)contentPart);
+        QCOMPARE(contentPart->availableContents(), ContentPart::PlainText);
+        auto contentList = contentPart->content(ContentPart::PlainText);
+        QCOMPARE(contentList.size(), 1);
+        QCOMPARE(contentList[0]->content(), QStringLiteral("If you can see this text it means that your email client couldn't display our newsletter properly.\nPlease visit this link to view the newsletter on our website: http://www.gog.com/newsletter/\n\n- GOG.com Team\n\n").toLocal8Bit());
+        QCOMPARE(contentList[0]->charset(), QStringLiteral("utf-8").toLocal8Bit());
+        QCOMPARE(contentList[0]->encryptions().size(), 0);
+        QCOMPARE(contentList[0]->signatures().size(), 0);
+    }
+
+    void testTextAlternative()
+    {
+        Parser parser(readMailFromFile("alternative.mbox"));
+        auto contentPart = parser.collectContentPart();
+        QVERIFY((bool)contentPart);
+        QCOMPARE(contentPart->availableContents(), ContentPart::PlainText | ContentPart::Html);
+    }
+
+     void testTextHtml()
+    {
+        Parser parser(readMailFromFile("html.mbox"));
+        auto contentPart = parser.collectContentPart();
+        QVERIFY((bool)contentPart);
+        QCOMPARE(contentPart->availableContents(), ContentPart::Html);
     }
 };