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

Merge PR #14: Update energy-plugin path environment variable behaviour

fix-dst-switch-lockup
jenkins 2022-10-17 11:22:56 +02:00
parent 78978e0487 f05fd88937
commit 396807fac9
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugin/experiencepluginenergy.cpp
View File

@ -1,6 +1,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Copyright 2013 - 2020, nymea GmbH
* Copyright 2013 - 2022, nymea GmbH
* Contact: contact@nymea.io
*
* This file is part of nymea.
@ -81,18 +81,30 @@ void ExperiencePluginEnergy::loadPlugins()
QStringList ExperiencePluginEnergy::pluginSearchDirs() const
{
const char *envDefaultPath = "NYMEA_ENERGY_PLUGINS_PATH";
const char *envExtraPath = "NYMEA_ENERGY_PLUGINS_EXTRA_PATH";
QStringList searchDirs;
QByteArray envPath = qgetenv("NYMEA_ENERGY_PLUGINS_PATH");
if (!envPath.isEmpty()) {
searchDirs << QString(envPath).split(':');
QByteArray envExtraPathData = qgetenv(envExtraPath);
if (!envExtraPathData.isEmpty()) {
searchDirs << QString::fromUtf8(envExtraPathData).split(':');
}
if (qEnvironmentVariableIsSet(envDefaultPath)) {
QByteArray envDefaultPathData = qgetenv(envDefaultPath);
if (!envDefaultPathData.isEmpty()) {
searchDirs << QString::fromUtf8(envDefaultPathData).split(':');
}
} else {
foreach (QString libraryPath, QCoreApplication::libraryPaths()) {
searchDirs << libraryPath.replace("qt5", "nymea").replace("plugins", "energy");
}
searchDirs << QCoreApplication::applicationDirPath() + "/../lib/nymea/energy";
searchDirs << QCoreApplication::applicationDirPath() + "/../energy/";
searchDirs << QCoreApplication::applicationDirPath() + "/../../../energy/";
searchDirs << QDir(QCoreApplication::applicationDirPath() + "/../lib/nymea/energy").absolutePath();
searchDirs << QDir(QCoreApplication::applicationDirPath() + "/../energy/").absolutePath();
searchDirs << QDir(QCoreApplication::applicationDirPath() + "/../../../energy/").absolutePath();
}
searchDirs.removeDuplicates();
return searchDirs;
}