From 744f25312bcfe05fa12a2876bfd5c6615a6dff58 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Wed, 15 Jan 2020 12:32:32 +0100
Subject: [PATCH] Cleanup as code review suggests

---
 libnymea-core/devices/devicemanagerimplementation.cpp | 3 +--
 libnymea-core/devices/scriptdeviceplugin.h            | 2 +-
 libnymea-core/logging/logengine.cpp                   | 2 +-
 libnymea-core/scriptengine/scriptengine.cpp           | 2 +-
 libnymea-core/scriptengine/scriptstate.cpp            | 2 --
 libnymea/loggingcategories.cpp                        | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/libnymea-core/devices/devicemanagerimplementation.cpp b/libnymea-core/devices/devicemanagerimplementation.cpp
index f7f9f8d8..3c90abda 100644
--- a/libnymea-core/devices/devicemanagerimplementation.cpp
+++ b/libnymea-core/devices/devicemanagerimplementation.cpp
@@ -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";
diff --git a/libnymea-core/devices/scriptdeviceplugin.h b/libnymea-core/devices/scriptdeviceplugin.h
index 266ddfae..b9082f63 100644
--- a/libnymea-core/devices/scriptdeviceplugin.h
+++ b/libnymea-core/devices/scriptdeviceplugin.h
@@ -96,7 +96,7 @@ signals:
     void finished();
 private:
     DeviceSetupInfo *m_info = nullptr;
-    ScriptDevice* m_device = nullptr;
+    ScriptDevice *m_device = nullptr;
 };
 
 class ScriptDevicePairingInfo: public QObject
diff --git a/libnymea-core/logging/logengine.cpp b/libnymea-core/logging/logengine.cpp
index 588ab4c2..0313154d 100644
--- a/libnymea-core/logging/logengine.cpp
+++ b/libnymea-core/logging/logengine.cpp
@@ -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;
diff --git a/libnymea-core/scriptengine/scriptengine.cpp b/libnymea-core/scriptengine/scriptengine.cpp
index ddc385dd..0819ebaa 100644
--- a/libnymea-core/scriptengine/scriptengine.cpp
+++ b/libnymea-core/scriptengine/scriptengine.cpp
@@ -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();
diff --git a/libnymea-core/scriptengine/scriptstate.cpp b/libnymea-core/scriptengine/scriptstate.cpp
index f3b79bb6..76c40afc 100644
--- a/libnymea-core/scriptengine/scriptstate.cpp
+++ b/libnymea-core/scriptengine/scriptstate.cpp
@@ -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);
 }
 
diff --git a/libnymea/loggingcategories.cpp b/libnymea/loggingcategories.cpp
index 33d3d838..9412120c 100644
--- a/libnymea/loggingcategories.cpp
+++ b/libnymea/loggingcategories.cpp
@@ -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;
         }
     }