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

Cleanup as code review suggests

pull/231/head
Michael Zanetti 2020-01-15 12:32:32 +01:00
parent 21f61b89a2
commit 744f25312b
6 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libnymea-core/devices/devicemanagerimplementation.cpp
View File

@ -302,7 +302,6 @@ DeviceSetupInfo* DeviceManagerImplementation::addConfiguredDevice(const DeviceCl
* Returns \l{DeviceError} to inform about the result. */
DeviceSetupInfo *DeviceManagerImplementation::addConfiguredDevice(const DeviceDescriptorId &deviceDescriptorId, const ParamList &params, const QString &name)
{
qWarning() << "Have descriptors" << m_discoveredDevices.keys();
DeviceDescriptor descriptor = m_discoveredDevices.value(deviceDescriptorId);
if (!descriptor.isValid()) {
qCWarning(dcDeviceManager()) << "Cannot add device. DeviceDescriptor" << deviceDescriptorId << "not found.";
@ -1139,7 +1138,7 @@ void DeviceManagerImplementation::loadPlugins()
}
ScriptDevicePlugin *plugin = new ScriptDevicePlugin(this);
bool ret = plugin->loadScript("/home/micha/Develop/nymea-plugin-jstest/devicepluginjstest.js");
bool ret = plugin->loadScript(jsFi.absoluteFilePath());
if (!ret) {
delete plugin;
qCWarning(dcDeviceManager()) << "JS plugin failed to load";

2
libnymea-core/devices/scriptdeviceplugin.h
View File

@ -96,7 +96,7 @@ signals:
void finished();
private:
DeviceSetupInfo *m_info = nullptr;
ScriptDevice* m_device = nullptr;
ScriptDevice *m_device = nullptr;
};
class ScriptDevicePairingInfo: public QObject

2
libnymea-core/logging/logengine.cpp
View File

@ -476,7 +476,7 @@ void LogEngine::appendLogEntry(const LogEntry &entry)
connect(job, &DatabaseJob::finished, this, [this, job, entry](){
if (job->error().type() != QSqlError::NoError) {
qCWarning(dcLogEngine) << "Error writing log entry. Driver error:" << job->error().driverText() << "Database error:" << job->error().number() << job->error().databaseText();
qCWarning(dcLogEngine) << "Error writing log entry. Driver error:" << job->error().driverText() << "Database error:" << job->error().databaseText();
qCWarning(dcLogEngine) << entry;
m_dbMalformed = true;
return;

2
libnymea-core/scriptengine/scriptengine.cpp
View File

@ -308,7 +308,7 @@ ScriptEngine::ScriptError ScriptEngine::removeScript(const QUuid &id)
void ScriptEngine::loadScripts()
{
QDir dir(NymeaSettings::storagePath() + "/scripts/");
foreach (const QString &entry, dir.entryList({"*json"})) {
foreach (const QString &entry, dir.entryList({"*.json"})) {
qCDebug(dcScriptEngine()) << "Have script:" << entry;
QFileInfo jsonFileInfo(NymeaSettings::storagePath() + "/scripts/" + entry);
QString jsonFileName = jsonFileInfo.absoluteFilePath();

2
libnymea-core/scriptengine/scriptstate.cpp
View File

@ -178,12 +178,10 @@ QVariant ScriptState::maximumValue() const
void ScriptState::store()
{
m_valueStore = value();
qCDebug(dcScriptEngine()) << "Storing value:" << m_valueStore;
}
void ScriptState::restore()
{
qCDebug(dcScriptEngine()) << "Restoring value:" << m_valueStore << m_valueStore.value<QColor>().toRgb();
setValue(m_valueStore);
}

2
libnymea/loggingcategories.cpp
View File

@ -140,7 +140,7 @@ bool initLogging(const QString &fileName, bool useColors)
}
s_logFile.setFileName(fileName);
if (!s_logFile.open(QFile::WriteOnly | QFile::Append)) {
qWarning() << "Error opening log file:" <<fileName;
qWarning() << "Error opening log file:" << fileName;
return false;
}
}