# HG changeset patch # User Chris Cannam # Date 1535560926 -3600 # Node ID 0ee87bc10cdc3a2a163c5ac1d3ce064b92cc51f1 # Parent 68a0abfe7263ffff196f845c7dbe01c892f6a8c3 Use error codes from checker to format our own translatable error report diff -r 68a0abfe7263 -r 0ee87bc10cdc plugin/PluginScan.cpp --- a/plugin/PluginScan.cpp Mon Aug 13 15:37:41 2018 +0100 +++ b/plugin/PluginScan.cpp Wed Aug 29 17:42:06 2018 +0100 @@ -18,11 +18,7 @@ #include "base/Preferences.h" #include "base/HelperExecPath.h" -#ifdef HAVE_PLUGIN_CHECKER_HELPER -#include "checker/knownplugincandidates.h" -#else -class KnownPluginCandidates {}; -#endif +#include #include #include @@ -182,6 +178,95 @@ #endif } +#ifdef HAVE_PLUGIN_CHECKER_HELPER +QString +PluginScan::formatFailureReport(QString tag, + std::vector failures) const +{ + int n = int(failures.size()); + int i = 0; + + std::ostringstream os; + + os << "
    "; + for (auto f: failures) { + os << "
  • " + f.library; + + SVDEBUG << "PluginScan::formatFailureReport: tag is \"" << tag + << "\", failure code is " << int(f.code) << ", message is \"" + << f.message << "\"" << endl; + + QString userMessage = QString::fromStdString(f.message); + + switch (f.code) { + + case PluginCheckCode::FAIL_LIBRARY_NOT_FOUND: + userMessage = QObject::tr("Library file could not be opened"); + break; + + case PluginCheckCode::FAIL_WRONG_ARCHITECTURE: + if (tag == "64" || (sizeof(void *) == 8 && tag == "")) { + userMessage = QObject::tr + ("Library has wrong architecture - possibly a 32-bit plugin installed in a folder for 64-bit plugins"); + } else if (tag == "32" || (sizeof(void *) == 4 && tag == "")) { + userMessage = QObject::tr + ("Library has wrong architecture - possibly a 64-bit plugin installed in a folder for 32-bit plugins"); + } + break; + + case PluginCheckCode::FAIL_DEPENDENCY_MISSING: + userMessage = QObject::tr + ("Library depends on another library that cannot be found: %1") + .arg(userMessage); + break; + + case PluginCheckCode::FAIL_NOT_LOADABLE: + userMessage = QObject::tr + ("Library cannot be loaded: %1").arg(userMessage); + break; + + case PluginCheckCode::FAIL_DESCRIPTOR_MISSING: + userMessage = QObject::tr + ("Not a valid plugin library (no descriptor found)"); + break; + + case PluginCheckCode::FAIL_NO_PLUGINS: + userMessage = QObject::tr + ("Library contains no plugins"); + break; + + case PluginCheckCode::FAIL_OTHER: + if (userMessage == "") { + userMessage = QObject::tr + ("Unknown error"); + } + break; + + case PluginCheckCode::SUCCESS: + // success shouldn't happen here! + break; + } + + os << "
    " + userMessage.toStdString() + ""; + os << "
  • "; + + if (n > 10) { + if (++i == 5) { + os << "
  • "; + os << QObject::tr("... and %n further failure(s)", + "", n - i) + .toStdString(); + os << "
  • "; + break; + } + } + } + os << "
"; + + return QString::fromStdString(os.str()); +} +#endif + QString PluginScan::getStartupFailureReport() const { @@ -204,7 +289,8 @@ QString report; for (auto kp: m_kp) { - report += QString::fromStdString(kp.second->getFailureReport()); + auto failures = kp.second->getFailures(); + report += formatFailureReport(kp.first, failures); } if (report == "") { return report; diff -r 68a0abfe7263 -r 0ee87bc10cdc plugin/PluginScan.h --- a/plugin/PluginScan.h Mon Aug 13 15:37:41 2018 +0100 +++ b/plugin/PluginScan.h Wed Aug 29 17:42:06 2018 +0100 @@ -20,7 +20,11 @@ #include #include -class KnownPluginCandidates; +#ifdef HAVE_PLUGIN_CHECKER_HELPER +#include "checker/knownplugincandidates.h" +#else +class KnownPluginCandidates {}; +#endif class PluginScan { @@ -73,6 +77,12 @@ void clear(); +#ifdef HAVE_PLUGIN_CHECKER_HELPER + QString formatFailureReport(QString helperTag, + std::vector) + const; +#endif + mutable QMutex m_mutex; // while scanning; definitely can't multi-thread this std::map m_kp; // tag -> KnownPlugins client