From 8aa2feb7c6acbb1b37fadff6bd119ca1b561b7c5 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 7 Sep 2020 00:08:08 +0200
Subject: [PATCH] Make python plugins appear in the logging categories list

---
 .../integrations/pythonintegrationplugin.cpp  |  1 -
 .../thingmanagerimplementation.cpp            | 45 ++++++++++++++-----
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/libnymea-core/integrations/pythonintegrationplugin.cpp b/libnymea-core/integrations/pythonintegrationplugin.cpp
index 47ffac42..799b050e 100644
--- a/libnymea-core/integrations/pythonintegrationplugin.cpp
+++ b/libnymea-core/integrations/pythonintegrationplugin.cpp
@@ -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);
diff --git a/libnymea-core/integrations/thingmanagerimplementation.cpp b/libnymea-core/integrations/thingmanagerimplementation.cpp
index 3dcd4576..e9edb9f0 100644
--- a/libnymea-core/integrations/thingmanagerimplementation.cpp
+++ b/libnymea-core/integrations/thingmanagerimplementation.cpp
@@ -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;