Encapsulated parts

1 files changed, 25 insertions, 13 deletions

diff --git a/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp b/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp
index b137be87..8d8ddf12 100644
--- a/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp
+++ b/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp
@@ -190,20 +190,17 @@ KMime::Content *ObjectTreeParser::find(const std::function<bool(KMime::Content *
  * Filter to avoid evaluating a subtree.
  * Select parts to include it in the result set. Selecting a part in a branch will keep any parent parts from being selected.
  */
-static QVector<MessagePart::Ptr> collect(MessagePart::Ptr start, const std::function<bool(const MessagePartPtr &)> &filter, const std::function<bool(const MessagePartPtr &)> &select)
+static QVector<MessagePart::Ptr> collect(MessagePart::Ptr start, const std::function<bool(const MessagePartPtr &)> &evaluateSubtree, const std::function<bool(const MessagePartPtr &)> &select)
 {
     MessagePartPtr ptr = start.dynamicCast<MessagePart>();
     Q_ASSERT(ptr);
-    if (!filter(ptr)) {
-        return {};
-    }
-
     QVector<MessagePart::Ptr> list;
-    if (ptr) {
+    if (evaluateSubtree(ptr)) {
         for (const auto &p: ptr->subParts()) {
-            list << ::collect(p, filter, select);
+            list << ::collect(p, evaluateSubtree, select);
         }
     }
+
     //Don't consider this part if we already selected a subpart
     if (list.isEmpty()) {
         if (select(ptr)) {
@@ -213,14 +210,25 @@ static QVector<MessagePart::Ptr> collect(MessagePart::Ptr start, const std::func
     return list;
 }
 
-QVector<MessagePart::Ptr> ObjectTreeParser::collectContentParts()
+QVector<MessagePartPtr> ObjectTreeParser::collectContentParts()
 {
-    QVector<MessagePart::Ptr> contentParts = ::collect(mParsedPart,
-        [] (const MessagePartPtr &part) {
-            // return p->type() != "EncapsulatedPart";
+    return collectContentParts(mParsedPart);
+}
+
+QVector<MessagePart::Ptr> ObjectTreeParser::collectContentParts(MessagePart::Ptr start)
+{
+    return ::collect(start,
+        [start] (const MessagePartPtr &part) {
+            //Ignore the top-level
+            if (start.data() == part.data()) {
+                return true;
+            }
+            if (auto e = part.dynamicCast<MimeTreeParser::EncapsulatedRfc822MessagePart>()) {
+                return false;
+            }
             return true;
         },
-        [] (const MessagePartPtr &part) {
+        [start] (const MessagePartPtr &part) {
             if (dynamic_cast<MimeTreeParser::AttachmentMessagePart*>(part.data())) {
                 return false;
             } else if (const auto text = dynamic_cast<MimeTreeParser::TextMessagePart*>(part.data())) {
@@ -233,6 +241,11 @@ QVector<MessagePart::Ptr> ObjectTreeParser::collectContentParts()
                 return true;
             } else if (dynamic_cast<MimeTreeParser::HtmlMessagePart*>(part.data())) {
                 return true;
+            } else if (dynamic_cast<MimeTreeParser::EncapsulatedRfc822MessagePart*>(part.data())) {
+                if (start.data() == part.data()) {
+                    return false;
+                }
+                return true;
             } else if (const auto enc = dynamic_cast<MimeTreeParser::EncryptedMessagePart*>(part.data())) {
                 if (enc->error()) {
                     return true;
@@ -247,7 +260,6 @@ QVector<MessagePart::Ptr> ObjectTreeParser::collectContentParts()
             }
             return false;
         });
-    return contentParts;
 }
 
 QVector<MessagePart::Ptr> ObjectTreeParser::collectAttachmentParts()