Refactoring

sailfishos · Mar 16, 2011 · b13fe2c · b13fe2c
1 parent 196a9cc
commit b13fe2c
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 45 deletions.
diff --git a/adaptors/alsadaptor/alsadaptor.cpp b/adaptors/alsadaptor/alsadaptor.cpp
@@ -68,8 +68,8 @@ ALSAdaptor::ALSAdaptor(const QString& id):
                                  QDBusConnection::systemBus(), this);
 #endif
 
-    QString rm680_als = Config::configuration()->value("als_dev_path_rm680", RM680_ALS).toString();
-    QString rm696_als = Config::configuration()->value("als_dev_path_rm696", RM696_ALS).toString();
+    QString rm680_als = Config::configuration()->value<QString>("als_dev_path_rm680", RM680_ALS);
+    QString rm696_als = Config::configuration()->value<QString>("als_dev_path_rm696", RM696_ALS);
 
     if (QFile::exists(rm680_als))
     {

diff --git a/adaptors/magnetometeradaptor/magnetometeradaptor.cpp b/adaptors/magnetometeradaptor/magnetometeradaptor.cpp
@@ -45,7 +45,7 @@ MagnetometerAdaptor::MagnetometerAdaptor(const QString& id) :
     SysfsAdaptor(id, SysfsAdaptor::IntervalMode, false)
 {
     driverHandle_ = getDriverHandle();
-    if (driverHandle_.size() == 0) {
+    if (driverHandle_.isEmpty()) {
         sensordLogW() << "Input device not found.";
     } else {
         sensordLogD() << "Detected magnetometer driver at " << driverHandle_;
@@ -74,13 +74,13 @@ MagnetometerAdaptor::~MagnetometerAdaptor()
 
 QString MagnetometerAdaptor::getDriverHandle() const
 {
-    QString magFile = Config::configuration()->value("mag_ak8974_dev_path").toString();
-    if (magFile.size() > 0 && QFile::exists(magFile)) {
+    QString magFile = Config::configuration()->value<QString>("mag_ak8974_dev_path");
+    if (!magFile.isNull() && QFile::exists(magFile)) {
         return magFile;
     }
 
-    magFile = Config::configuration()->value("mag_ak8975_dev_path").toString();
-    if (magFile.size() > 0 && QFile::exists(magFile)) {
+    magFile = Config::configuration()->value<QString>("mag_ak8975_dev_path");
+    if (!magFile.isNull() && QFile::exists(magFile)) {
         return magFile;
     }
 

diff --git a/adaptors/proximityadaptor/proximityadaptor.cpp b/adaptors/proximityadaptor/proximityadaptor.cpp
@@ -67,8 +67,8 @@ ProximityAdaptor::ProximityAdaptor(const QString& id) :
 
     device = DeviceUnknown;
 
-    QString rm680_ps = Config::configuration()->value("proximity_dev_path_rm680", RM680_PS).toString();
-    QString rm696_ps = Config::configuration()->value("proximity_dev_path_rm696", RM696_PS).toString();
+    QString rm680_ps = Config::configuration()->value<QString>("proximity_dev_path_rm680", RM680_PS);
+    QString rm696_ps = Config::configuration()->value<QString>("proximity_dev_path_rm696", RM696_PS);
 
     if (QFile::exists(rm680_ps))
     {
@@ -177,7 +177,7 @@ int ProximityAdaptor::readThreshold()
     int value = 0;
     QString configKey = "proximity_threshold_path";
     QString configFileName = (device == RM680 ? THRESHOLD_FILE_PATH_RM680 : THRESHOLD_FILE_PATH_RM696);
-    QFile thresholdFile(Config::configuration()->value(configKey, configFileName).toString());
+    QFile thresholdFile(Config::configuration()->value(configKey, configFileName));
 
     if (!(thresholdFile.exists() && thresholdFile.open(QIODevice::ReadOnly))) {
         sensordLogW() << "Unable to locate threshold setting for " << id();

diff --git a/chains/accelerometerchain/accelerometerchain.cpp b/chains/accelerometerchain/accelerometerchain.cpp
@@ -51,7 +51,7 @@ AccelerometerChain::AccelerometerChain(const QString& id) :
     accelerometerReader_ = new BufferReader<AccelerationData>(1);
 
     // Get the transformation matrix from config file
-    QString aconvString = Config::configuration()->value("acc_trans_matrix", "").toString();
+    QString aconvString = Config::configuration()->value<QString>("acc_trans_matrix", "");
     if (aconvString.size() > 0)
     {
         if (!setMatrixFromString(aconvString))

diff --git a/core/config.cpp b/core/config.cpp
@@ -99,15 +99,20 @@ bool Config::loadConfigFile(const QString &configFileName) {
     return false;
 }
 
-QVariant Config::value(const QString &key, const QVariant &defaultValue) const {
+QVariant Config::value(const QString &key) const {
     /* Iterate through configs so that keys in the first files
      * have preference over the last.
      */
     foreach(QSettings* setting, settings) {
         if(setting->contains(key))
-            return setting->value(key, defaultValue);
+        {
+            QVariant var = setting->value(key, QVariant());
+            if(var.isValid())
+                sensordLogD() << "Value for key '" << key << "': " << var.toString();
+            return var;
+        }
     }
-    return defaultValue;
+    return QVariant();
 }
 
 QStringList Config::groups() const
@@ -133,3 +138,8 @@ void Config::close() {
     delete static_configuration;
     static_configuration = 0;
 }
+
+bool Config::exists(const QString &key) const
+{
+    return value(key).isValid();
+}
diff --git a/core/config.h b/core/config.h
@@ -41,9 +41,14 @@ class Config {
 public:
     ~Config();
 
-    QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
+    QVariant value(const QString &key) const;
     QStringList groups() const;
 
+    template<typename T>
+    T value(const QString &key, const T &def = T()) const;
+
+    bool exists(const QString &key) const;
+
     static Config *configuration();
     static bool loadConfig(const QString &defConfigPath, const QString &configDPath);
     static void close();
@@ -59,4 +64,13 @@ class Config {
     QList<QSettings*> settings;
 };
 
+template<typename T>
+T Config::value(const QString &key, const T &def) const
+{
+    QVariant val(value(key));
+    if(!val.isValid())
+        return def;
+    return val.value<T>();
+}
+
 #endif // SENSORD_CONFIG_H
diff --git a/core/inputdevadaptor.cpp b/core/inputdevadaptor.cpp
@@ -78,15 +78,15 @@ int InputDevAdaptor::getInputDevices(const QString& matchString)
 
     // Check if this device name is defined in configuration
     QString configKey = QString("dev_%1").arg(matchString);
-    QString deviceName = Config::configuration()->value(configKey, "DEV_NOT_FOUND").toString();
+    QString deviceName = Config::configuration()->value<QString>(configKey, "");
 
     // Do not perform strict checks for the input device
-    if (deviceName != "DEV_NOT_FOUND" && checkInputDevice(deviceName, matchString, false)) {
+    if (deviceName.size() && checkInputDevice(deviceName, matchString, false)) {
         addPath(deviceName, deviceCount_);
         ++deviceCount_;
         deviceNumber_ = deviceNumber;
     }
-    else
+    else if(!deviceSysPathString_.contains("%1"))
     {
         const int MAX_EVENT_DEV = 16;
 
@@ -103,14 +103,10 @@ int InputDevAdaptor::getInputDevices(const QString& matchString)
     }
 
     QString pollConfigKey = QString("dev_poll_%1").arg(deviceString_);
-    if (Config::configuration()->value(pollConfigKey, "").toString().size() > 0) {
-        usedDevicePollFilePath_ = Config::configuration()->value(pollConfigKey, "").toString();
-    } else {
-        usedDevicePollFilePath_ = devicePollFilePath_.arg(deviceNumber_);
-    }
+    usedDevicePollFilePath_ = Config::configuration()->value<QString>(pollConfigKey, devicePollFilePath_.arg(deviceNumber_));
 
     if (deviceCount_ == 0) {
-        sensordLogW() << "Cannot find any device for: " << matchString;
+        sensordLogW() << id() << " cannot find any device for: " << matchString;
         setValid(false);
     }
 

diff --git a/core/loader.cpp b/core/loader.cpp
@@ -141,7 +141,7 @@ bool Loader::loadPlugin(const QString& name, QString* errorString)
 
 QString Loader::resolveRealPluginName(const QString& pluginName) const
 {
-    QString deviceId = Config::configuration()->value("deviceId", "default").toString();
+    QString deviceId = Config::configuration()->value<QString>("deviceId", "default");
     QString key = QString("%1/%2").arg(deviceId).arg(pluginName);
 
     QString nameFromConfig = Config::configuration()->value(key).toString();

diff --git a/core/logging.cpp b/core/logging.cpp
@@ -64,11 +64,6 @@ void SensordLogger::setOutputLevel(SensordLogLevel level)
     outputLevel = level;
 }
 
-SensordLogLevel SensordLogger::getOutputLevel()
-{
-    return outputLevel;
-}
-
 void SensordLogger::close()
 {
     if (initialized)

diff --git a/core/logging.h b/core/logging.h
@@ -49,30 +49,30 @@ class SensordLogger
 
     SensordLogger& operator<<(const QStringList& item)
     {
-        if(initialized && isLoggable(currentLevel))
+        if(initialized && oss && isLoggable(currentLevel))
             return this->operator<<(item.join(", "));
         return *this;
     }
 
     SensordLogger& operator<<(const QString& item)
     {
-        if(initialized && isLoggable(currentLevel))
+        if(initialized && oss && isLoggable(currentLevel))
             *oss << item.toStdString();
         return *this;
     }
 
     template <typename T>
     SensordLogger& operator<<(const T& item)
     {
-        if(initialized && isLoggable(currentLevel))
+        if(initialized && oss && isLoggable(currentLevel))
             *oss << item;
         return *this;
     }
 
 public:
 
     static void setOutputLevel(SensordLogLevel level);
-    static SensordLogLevel getOutputLevel();
+    static inline SensordLogLevel getOutputLevel() { return outputLevel; }
     static void init(int target, QString logFilePath);
     static void close();
 

diff --git a/core/sysfsadaptor.cpp b/core/sysfsadaptor.cpp
@@ -153,7 +153,7 @@ void SysfsAdaptor::stopSensor(const QString& sensorId)
     AdaptedSensorEntry *entry = findAdaptedSensor(sensorId);
 
     if (entry == NULL) {
-        sensordLogW() << "Sensor not found" << sensorId;
+        sensordLogW() << "Sensor not found " << sensorId;
         return;
     }
 

diff --git a/debian/changelog b/debian/changelog
@@ -14,6 +14,8 @@ sensord (0.6.41) unstable; urgency=low
     - SensorManager::addSensor() now gracefully handles if object registration to dbus fails.
     - SocketHandler::socketReadable now gracefully handles if client writes sessionId incorrectly.
     - Cleanup for adaptor codes
+    - Better error checks in InputDevAdaptor::getInputDevices().
+    - Logger optimized a bit.
   * Downsampling (which works by dropping samples) can be now enabled/disabled.
   * OrientationInterpreter filter orientation_buffer_size is now configurable.
   * Threshold accessors removed from OrientationFilter since those had no effect.
@@ -27,6 +29,7 @@ sensord (0.6.41) unstable; urgency=low
   * Implemented new downsampling logic:
     - AccelerometerAdaptor interval rangelist has been limited to certain sizes.
     - AccelerometerSensorChannel downsamples data before propagating it.
+  * Config-class has now more friendly API.
 
   [Shenghua Liu]
   * Make sensortestapp thread safe in exiting

diff --git a/tests/testapp/abstractsensorhandler.cpp b/tests/testapp/abstractsensorhandler.cpp
@@ -40,11 +40,11 @@ AbstractSensorHandler::AbstractSensorHandler(const QString& sensorName, QObject
 {
     if (Config::configuration() != NULL)
     {
-        interval_ = Config::configuration()->value(sensorName_ + "/interval", "100").toInt();
-        bufferinterval_ = Config::configuration()->value(sensorName_ + "/bufferinterval", "0").toInt();
-        standbyoverride_ = Config::configuration()->value(sensorName_ + "/standbyoverride", "0").toBool();
-        buffersize_ = Config::configuration()->value(sensorName_ + "/buffersize", "0").toInt();
-        downsample_ = Config::configuration()->value(sensorName_ + "/downsample", "0").toBool();
+        interval_ = Config::configuration()->value(sensorName_ + "/interval", 100);
+        bufferinterval_ = Config::configuration()->value(sensorName_ + "/bufferinterval", 0);
+        standbyoverride_ = Config::configuration()->value(sensorName_ + "/standbyoverride", false);
+        buffersize_ = Config::configuration()->value(sensorName_ + "/buffersize", 0);
+        downsample_ = Config::configuration()->value(sensorName_ + "/downsample", false);
     }
 }
 

diff --git a/tests/testapp/clientadmin.cpp b/tests/testapp/clientadmin.cpp
@@ -24,6 +24,7 @@
 */
 
 #include "clientadmin.h"
+#include "config.h"
 
 const char* ClientAdmin::CONFIG_FILE_PATH = "/usr/share/sensord-tests/testapp.conf";
 
@@ -70,7 +71,7 @@ void ClientAdmin::runClients()
 
     foreach (const QString& sensorName, Config::configuration()->groups())
     {
-        int count = Config::configuration()->value(sensorName + "/instances", "0").toInt();
+        int count = 0;//Config::configuration()->value<int>(sensorName + "/instances", 0);
         for(int i = 0; i < count; ++i)
         {
             SensorHandler* handler = new SensorHandler(sensorName, this);

diff --git a/tests/testapp/main.cpp b/tests/testapp/main.cpp
@@ -25,7 +25,6 @@
 */
 
 #include <QCoreApplication>
-#include <QTest>
 #include <QList>
 #include <QString>
 #include <QDebug>
@@ -47,7 +46,7 @@ void sigIntHandler(int param)
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication app(argc, argv);    
+    QCoreApplication app(argc, argv);
 
     Parser parser(app.arguments());
 

diff --git a/tests/testapp/testapp.pro b/tests/testapp/testapp.pro
@@ -1,4 +1,4 @@
-QT += core testlib dbus network
+QT += core dbus network
 QT -= gui
 
 CONFIG += debug
@@ -13,7 +13,7 @@ isEmpty(TARGET_LIB) {
 HEADERS += parser.h \
            statprinter.h \
            abstractsensorhandler.h \
-    clientadmin.h
+           clientadmin.h
 
 SOURCES += main.cpp \
            parser.cpp \