From e452707fdfbd61be1e5633b516b653b7337e7865 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 29 May 2017 16:17:04 +0200 Subject: Reduced the messagetreeparser to aproximately what we actually require While in a much more managable state it's still not pretty. However, further refactoring can now gradually happen as we need to do further work on it. Things that should happen eventually: * Simplify the logic that creates the messageparts (we don't need the whole formatter plugin complexity) * Get rid of the nodehelper (let the parts hold the necessary data) * Get rid of partmetadata (let the part handleit) --- framework/src/domain/mime/mimetreeparser/utils.cpp | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 framework/src/domain/mime/mimetreeparser/utils.cpp (limited to 'framework/src/domain/mime/mimetreeparser/utils.cpp') diff --git a/framework/src/domain/mime/mimetreeparser/utils.cpp b/framework/src/domain/mime/mimetreeparser/utils.cpp new file mode 100644 index 00000000..574e3489 --- /dev/null +++ b/framework/src/domain/mime/mimetreeparser/utils.cpp @@ -0,0 +1,71 @@ +/* + Copyright (c) 2016 Sandro Knauß + + 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 "utils.h" +#include "nodehelper.h" + +using namespace MimeTreeParser; + +MimeMessagePart::Ptr MimeTreeParser::createAndParseTempNode(Interface::BodyPart &part, KMime::Content *parentNode, const char *content, const char *cntDesc) +{ + KMime::Content *newNode = new KMime::Content(); + newNode->setContent(KMime::CRLFtoLF(content)); + newNode->parse(); + + if (!newNode->head().isEmpty()) { + newNode->contentDescription()->from7BitString(cntDesc); + } + part.nodeHelper()->attachExtraContent(parentNode, newNode); + + return MimeMessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), newNode, false)); +} + +KMime::Content *MimeTreeParser::findTypeInDirectChilds(KMime::Content *content, const QByteArray &mimeType) +{ + if (mimeType.isEmpty()) { + return content; + } + + foreach (auto child, content->contents()) { + if ((!child->contentType()->isEmpty()) + && (mimeType == child->contentType()->mimeType())) { + return child; + } + } + return nullptr; +} + +MessagePart::Ptr MimeTreeParser::toplevelTextNode(MessagePart::Ptr messageTree) +{ + foreach (const auto &mp, messageTree->subParts()) { + auto text = mp.dynamicCast(); + auto attach = mp.dynamicCast(); + if (text && !attach) { + return text; + } else if (const auto alternative = mp.dynamicCast()) { + return alternative; + } else if (const auto m = mp.dynamicCast()) { + auto ret = toplevelTextNode(m); + if (ret) { + return ret; + } + } + } + return MessagePart::Ptr(); +} -- cgit v1.2.3