ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make python plugins appear in the logging categories list

pull/341/head
Michael Zanetti 2020-09-07 00:08:08 +02:00
parent 15eead0976
commit 8aa2feb7c6
2 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libnymea-core/integrations/pythonintegrationplugin.cpp
View File

@ -330,7 +330,6 @@ bool PythonIntegrationPlugin::loadScript(const QString &scriptFile)
Py_DECREF(args);
// Override stdout and stderr
args = Py_BuildValue("(si)", category.toUtf8().data(), QtMsgType::QtInfoMsg);
PyStdOutHandler*stdOutHandler = reinterpret_cast<PyStdOutHandler*>(PyObject_CallObject((PyObject*)&PyStdOutHandlerType, args));
Py_DECREF(args);

45
libnymea-core/integrations/thingmanagerimplementation.cpp
View File

@ -64,6 +64,7 @@
#include <QCoreApplication>
#include <QStandardPaths>
#include <QDir>
#include <QJsonDocument>
ThingManagerImplementation::ThingManagerImplementation(HardwareManager *hardwareManager, const QLocale &locale, QObject *parent) :
ThingManager(parent),
@ -142,20 +143,44 @@ QStringList ThingManagerImplementation::pluginSearchDirs()
QList<QJsonObject> ThingManagerImplementation::pluginsMetadata()
{
QList<QJsonObject> pluginList;
QStringList searchDirs;
// Add first level of subdirectories to the plugin search dirs so we can point to a collection of plugins
foreach (const QString &path, pluginSearchDirs()) {
searchDirs.append(path);
QDir dir(path);
foreach (const QString &entry, dir.entryList()) {
QFileInfo fi;
foreach (const QString &subdir, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
searchDirs.append(path + '/' + subdir);
}
}
foreach (const QString &path, searchDirs) {
QDir dir(path);
qCDebug(dcThingManager) << "Loading plugins from:" << dir.absolutePath();
foreach (const QString &entry, dir.entryList({"*.so", "*.js", "*.py"}, QDir::Files)) {
QFileInfo fi(path + '/' + entry);
if (entry.startsWith("libnymea_integrationplugin") && entry.endsWith(".so")) {
fi.setFile(path + "/" + entry);
} else {
fi.setFile(path + "/" + entry + "/libnymea_integrationplugin" + entry + ".so");
QPluginLoader loader(fi.absoluteFilePath());
pluginList.append(loader.metaData().value("MetaData").toObject());
#if QT_VERSION >= QT_VERSION_CHECK(5,12,0)
} else if (entry.startsWith("integrationplugin") && entry.endsWith(".js")) {
QFile jsonFile(fi.absolutePath() + "/" + fi.baseName() + ".json");
if (!jsonFile.open(QFile::ReadOnly)) {
qCDebug(dcThingManager()) << "Failed to open json file for:" << entry;
continue;
}
QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonFile.readAll());
pluginList.append(jsonDoc.object());
#endif
} else if (entry.startsWith("integrationplugin") && entry.endsWith(".py")) {
QFile jsonFile(fi.absolutePath() + "/" + fi.baseName() + ".json");
if (!jsonFile.open(QFile::ReadOnly)) {
qCDebug(dcThingManager()) << "Failed to open json file for:" << entry;
continue;
}
QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonFile.readAll());
pluginList.append(jsonDoc.object());
}
if (!fi.exists()) {
continue;
}
QPluginLoader loader(fi.absoluteFilePath());
pluginList.append(loader.metaData().value("MetaData").toObject());
}
}
return pluginList;