Add a new LoggerSettings type

this independently accesses the settings file for the logger, and has a call to reinitialise it (which will cause settings to be reread)

5 files changed, 112 insertions, 2 deletions

diff --git a/daemon/sensorlogd.cpp b/daemon/sensorlogd.cpp
index 095ebd9..deb0799 100644
--- a/daemon/sensorlogd.cpp
+++ b/daemon/sensorlogd.cpp
@@ -26,7 +26,7 @@ int main(int argc, char **argv)
     }
     QCoreApplication::setOrganizationName("asteroid");
     QCoreApplication::setOrganizationDomain("asteroidos.org");
-    QCoreApplication::setApplicationName("healthd");
+    QCoreApplication::setApplicationName("sensorlogd");
     Logger sensorsLogger;
     qDebug() << "healthd started";
     qcoreapp.exec();
diff --git a/qmlplugin/CMakeLists.txt b/qmlplugin/CMakeLists.txt
index cb65f44..9455067 100644
--- a/qmlplugin/CMakeLists.txt
+++ b/qmlplugin/CMakeLists.txt
@@ -4,10 +4,12 @@ add_library(
     sensorlogdqmlplugin.h
     stepsDataLoader.cpp
     stepsDataLoader.h
+    loggerSettings.cpp
+    loggerSettings.h
 )
 
 target_link_libraries(sensorlogdqmlplugin
-	Qt5::Qml
+	Qt5::Qml Qt5::DBus
 )
 
 install(TARGETS sensorlogdqmlplugin
diff --git a/qmlplugin/loggerSettings.cpp b/qmlplugin/loggerSettings.cpp
new file mode 100644
index 0000000..c03c3c9
--- /dev/null
+++ b/qmlplugin/loggerSettings.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2023 Arseniy Movshev <dodoradio@outlook.com>
+ * This file is part of sensorlogd, a sensor logger for the AsteroidOS smartwatch OS.
+ *
+ * sensorlogd is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * sensorlogd is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <QDebug>
+#include <QStandardPaths>
+
+#include "loggerSettings.h"
+
+LoggerSettings::LoggerSettings() : QObject() {
+    m_settings = new QSettings("asteroid","sensorlogd");
+    m_iface = new QDBusInterface("org.asteroid.sensorlogd.logger","/org/asteroid/sensorlogd/logger","", QDBusConnection::sessionBus(), this);
+    if (!m_iface->isValid()) {
+        qDebug()<<"interface is not valid";
+    } else {
+        qDebug()<<"interface is valid";
+    }
+}
+
+void LoggerSettings::reInitLogger() {
+    m_iface->call("resetup");
+}
+
+bool LoggerSettings::getHeartrateSensorEnabled() {
+    return this->m_settings->value("heartrateSensor/enabled",true).toBool();
+}
+
+void LoggerSettings::setHeartrateSensorEnabled(bool value) {
+    this->m_settings->setValue("heartrateSensor/enabled",value);
+}
+
+int LoggerSettings::getHeartrateSensorInterval() {
+    return this->m_settings->value("heartrateSensor/interval",60000).toInt();
+}
+
+void LoggerSettings::setHeartrateSensorInterval(int value) {
+    this->m_settings->setValue("heartrateSensor/interval",value);
+}
+
+bool LoggerSettings::getStepCounterEnabled() {
+    return this->m_settings->value("stepCounter/enabled",true).toBool();
+}
+
+void LoggerSettings::setStepCounterEnabled(bool value) {
+    this->m_settings->setValue("stepCounter/enabled",value);
+}
+
+int LoggerSettings::getStepCounterInterval() {
+    return this->m_settings->value("stepCounter/interval",60000).toInt();
+}
+
+void LoggerSettings::setStepCounterInterval(int value) {
+    this->m_settings->setValue("stepCounter/interval",value);
+}
+
diff --git a/qmlplugin/loggerSettings.h b/qmlplugin/loggerSettings.h
new file mode 100644
index 0000000..de593f6
--- /dev/null
+++ b/qmlplugin/loggerSettings.h
@@ -0,0 +1,45 @@
+/*/*
+ * Copyright (C) 2023 Arseniy Movshev <dodoradio@outlook.com>
+ * This file is part of sensorlogd, a sensor logger for the AsteroidOS smartwatch OS.
+ *
+ * sensorlogd is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * sensorlogd is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef LOGGERSETTINGS_H
+#define LOGGERSETTINGS_H
+
+#include <QObject>
+#include <QSettings>
+#include <QDBusInterface>
+
+class LoggerSettings : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool heartrateSensorEnabled READ getHeartrateSensorEnabled WRITE setHeartrateSensorEnabled)
+    Q_PROPERTY(int heartrateSensorInterval READ getHeartrateSensorInterval WRITE setHeartrateSensorInterval)
+
+    Q_PROPERTY(bool stepCounterEnabled READ getStepCounterEnabled WRITE setStepCounterEnabled)
+    Q_PROPERTY(int stepCounterInterval READ getStepCounterInterval WRITE setStepCounterInterval)
+
+public:
+    explicit LoggerSettings();
+
+public slots:
+    Q_INVOKABLE void reInitLogger();
+    bool getHeartrateSensorEnabled();
+    void setHeartrateSensorEnabled(bool value);
+    int getHeartrateSensorInterval();
+    void setHeartrateSensorInterval(int value); // This setting won't change anything live - service needs to be restarted. TODO
+
+    bool getStepCounterEnabled();
+    void setStepCounterEnabled(bool value);
+    int getStepCounterInterval();
+    void setStepCounterInterval(int value); // This setting won't change anything live - service needs to be restarted. TODO
+private:
+    QSettings *m_settings;
+    QDBusInterface *m_iface;
+};
+#endif // LOGGERSETTINGS_H
diff --git a/qmlplugin/sensorlogdqmlplugin.cpp b/qmlplugin/sensorlogdqmlplugin.cpp
index 107c2be..d52812c 100644
--- a/qmlplugin/sensorlogdqmlplugin.cpp
+++ b/qmlplugin/sensorlogdqmlplugin.cpp
@@ -12,6 +12,7 @@
 #include "sensorlogdqmlplugin.h"
 #include <QtQml>
 #include "stepsDataLoader.h"
+#include "loggerSettings.h"
 
 LogdPlugin::LogdPlugin(QObject *parent) : QQmlExtensionPlugin(parent)
 {
@@ -21,5 +22,6 @@ void LogdPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("org.asteroid.sensorlogd"));
     qmlRegisterType<StepsDataLoader>(uri, 1, 0, "StepsDataLoader");
+    qmlRegisterType<LoggerSettings>(uri, 1, 0, "LoggerSettings");
 }