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) --- .../domain/mime/mimetreeparser/multipartmixed.cpp | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 framework/src/domain/mime/mimetreeparser/multipartmixed.cpp (limited to 'framework/src/domain/mime/mimetreeparser/multipartmixed.cpp') diff --git a/framework/src/domain/mime/mimetreeparser/multipartmixed.cpp b/framework/src/domain/mime/mimetreeparser/multipartmixed.cpp new file mode 100644 index 00000000..4231021e --- /dev/null +++ b/framework/src/domain/mime/mimetreeparser/multipartmixed.cpp @@ -0,0 +1,57 @@ +/* + 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 "multipartmixed.h" + +#include "objecttreeparser.h" +#include "messagepart.h" + +#include + +#include "mimetreeparser_debug.h" + +using namespace MimeTreeParser; + +const MultiPartMixedBodyPartFormatter *MultiPartMixedBodyPartFormatter::self; + +const Interface::BodyPartFormatter *MultiPartMixedBodyPartFormatter::create() +{ + if (!self) { + self = new MultiPartMixedBodyPartFormatter(); + } + return self; +} +MessagePart::Ptr MultiPartMixedBodyPartFormatter::process(Interface::BodyPart &part) const +{ + if (part.content()->contents().isEmpty()) { + return MessagePart::Ptr(); + } + + //In case of multipart/related we relay on the order of the parts. + //Theoretically there could also be a Start parameter which would break this.. + //https://tools.ietf.org/html/rfc2387#section-4 + bool showOnlyOneMimePart = [&] { + if (auto ct = part.content()->contentType(false)) { + return ct->mimeType() == "multipart/related"; + } + return false; + }(); + // normal treatment of the parts in the mp/mixed container + return MimeMessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), part.content()->contents().at(0), showOnlyOneMimePart)); +} -- cgit v1.2.3