diff --git a/messageviewer/src/viewer/bodypartformatterfactory.cpp b/messageviewer/src/viewer/bodypartformatterfactory.cpp index 59dd2a51..358c8e85 100644 --- a/messageviewer/src/viewer/bodypartformatterfactory.cpp +++ b/messageviewer/src/viewer/bodypartformatterfactory.cpp @@ -1,88 +1,99 @@ /* bodypartformatterfactory.cpp This file is part of KMail, the KDE mail client. Copyright (c) 2004 Marc Mutz , Ingo Kloecker KMail is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. KMail 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 General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ #include "bodypartformatterfactory.h" #include "urlhandlermanager.h" #include "messageviewer_debug.h" #include #include +#include +#include + using namespace MessageViewer; BodyPartFormatterFactory::BodyPartFormatterFactory() : MimeTreeParser::BodyPartFormatterBaseFactory() { } BodyPartFormatterFactory::~BodyPartFormatterFactory() { } void BodyPartFormatterFactory::loadPlugins() { KPluginLoader::forEachPlugin(QStringLiteral("messageviewer/bodypartformatter"), [this](const QString &path) { QPluginLoader loader(path); + const auto formatterData = loader.metaData().value(QLatin1String("MetaData")).toObject().value(QLatin1String("formatter")).toArray(); + if (formatterData.isEmpty()) { + qCWarning(MESSAGEVIEWER_LOG) << "Plugin" << path << "has no meta data."; + return; + } + auto plugin = qobject_cast(loader.instance()); if (!plugin) { qCWarning(MESSAGEVIEWER_LOG) << "BodyPartFormatterFactory: plugin" << path << "is not valid!"; return; } const MimeTreeParser::Interface::BodyPartFormatter *bfp = nullptr; - for (int i = 0; (bfp = plugin->bodyPartFormatter(i)); ++i) { - const char *type = plugin->type(i); - if (!type || !*type) { + for (int i = 0; (bfp = plugin->bodyPartFormatter(i)) && i < formatterData.size(); ++i) { + const auto metaData = formatterData.at(i).toObject(); + const auto type = metaData.value(QLatin1String("type")).toString().toUtf8(); + if (type.isEmpty()) { qCWarning(MESSAGEVIEWER_LOG) << "BodyPartFormatterFactory: plugin" << path << "returned empty type specification for index" << i; break; } - const char *subtype = plugin->subtype(i); - if (!subtype || !*subtype) { + const auto subtype = metaData.value(QLatin1String("subtype")).toString().toUtf8(); + if (subtype.isEmpty()) { qCWarning(MESSAGEVIEWER_LOG) << "BodyPartFormatterFactory: plugin" << path << "returned empty subtype specification for index" << i; break; } qCDebug(MESSAGEVIEWER_LOG) << "plugin for " << type << subtype; insert(type, subtype, bfp); } + const MimeTreeParser::Interface::BodyPartURLHandler *handler = nullptr; for (int i = 0; (handler = plugin->urlHandler(i)); ++i) { URLHandlerManager::instance()->registerHandler(handler); } }); } diff --git a/mimetreeparser/src/interfaces/bodypartformatter.h b/mimetreeparser/src/interfaces/bodypartformatter.h index 5839940e..f25a1af6 100644 --- a/mimetreeparser/src/interfaces/bodypartformatter.h +++ b/mimetreeparser/src/interfaces/bodypartformatter.h @@ -1,145 +1,142 @@ /* -*- mode: C++; c-file-style: "gnu" -*- bodypartformatter.h This file is part of KMail's plugin interface. Copyright (c) 2004 Marc Mutz , Ingo Kloecker KMail is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. KMail 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 General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ #ifndef __MIMETREEPARSER_INTERFACE_BODYPARTFORMATTER_H__ #define __MIMETREEPARSER_INTERFACE_BODYPARTFORMATTER_H__ #include "mimetreeparser_export.h" #include #include #include "mimetreeparser/objecttreeparser.h" namespace MimeTreeParser { class HtmlWriter; namespace Interface { class BodyPartURLHandler; class BodyPart; class MessagePartPrivate; class MIMETREEPARSER_EXPORT MessagePart : public QObject { Q_OBJECT Q_PROPERTY(QString plaintextContent READ plaintextContent) Q_PROPERTY(QString htmlContent READ htmlContent) public: typedef QSharedPointer Ptr; explicit MessagePart(); explicit MessagePart(const BodyPart &part); virtual ~MessagePart(); virtual void html(bool decorate); virtual QString text() const; void setParentPart(MessagePart *parentPart); MessagePart *parentPart() const; virtual QString plaintextContent() const; virtual QString htmlContent() const; virtual MimeTreeParser::HtmlWriter *htmlWriter() const; virtual void setHtmlWriter(MimeTreeParser::HtmlWriter *htmlWriter) const; private: MessagePartPrivate *d; friend class BodyPartFormatter; }; class MIMETREEPARSER_EXPORT BodyPartFormatter { public: virtual ~BodyPartFormatter() { } /** @li Ok returned when format() generated some HTML @li NeedContent returned when format() needs the body of the part @li AsIcon returned when the part should be shown iconified @li Failed returned when formatting failed. Currently equivalent to Ok */ enum Result { Ok, NeedContent, AsIcon, Failed }; /** Format body part \a part by generating some HTML and writing that to \a writer. If you a async process and need to send an update information you can use MimeTreeParser::NodeHelper::Update signal with the corresponding instance of BodyPart::nodeHelper() @return the result code (see above) */ virtual Result format(BodyPart *part, MimeTreeParser::HtmlWriter *writer) const; virtual void adaptProcessResult(ProcessResult &result) const { Q_UNUSED(result); } virtual MessagePart::Ptr process(BodyPart &part) const; }; /** @short interface for BodyPartFormatter plugins The interface is queried by for types, subtypes, and the corresponding bodypart formatter, and the result inserted into the bodypart formatter factory. Subtype alone or both type and subtype may be "*", which is taken as a wildcard, so that e.g. type=text subtype=* matches any text subtype, but with lesser specificity than a concrete mimetype such as text/plain. type=* is only allowed when subtype=*, too. */ class MIMETREEPARSER_EXPORT BodyPartFormatterPlugin { public: virtual ~BodyPartFormatterPlugin(); virtual const BodyPartFormatter *bodyPartFormatter(int idx) const = 0; - virtual const char *type(int idx) const = 0; - virtual const char *subtype(int idx) const = 0; - virtual const BodyPartURLHandler *urlHandler(int idx) const; }; } // namespace Interface } Q_DECLARE_INTERFACE(MimeTreeParser::Interface::BodyPartFormatterPlugin, "org.kde.messageviewer.bodypartformatter/1.0") #endif // __MIMETREEPARSER_INTERFACE_BODYPARTFORMATTER_H__