diff options
| -rw-r--r-- | daemon/logger.cpp | 8 | ||||
| -rw-r--r-- | qmlplugin/loggerSettings.cpp | 1 | ||||
| -rw-r--r-- | qmlplugin/stepsDataLoader.cpp | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/daemon/logger.cpp b/daemon/logger.cpp index 7222c95..984ae33 100644 --- a/daemon/logger.cpp +++ b/daemon/logger.cpp @@ -16,9 +16,9 @@ #include <QFile> #include <QDir> #include <QTextStream> -#include <QStandardPaths> #include <QTimer> #include <QDebug> +#include <QStandardPaths> #include "logger.h" @@ -115,10 +115,12 @@ QStringList fileGetPrevRecord(QString sensorPrefix, QDateTime recordTime) { } QString fileNameForDate(QDate date, QString prefix) { - return QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/asteroid-healthloggerd/" + prefix + "/" + date.toString("yyyy-MM-dd.log"); + QSettings settings("asteroid","sensorlogd"); //this should be moved out of here at some point TODO + return settings.value("loggerRootPath",QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/.asteroid-sensorlogd/").toString() + prefix + "/" + date.toString("yyyy-MM-dd.log"); } void setupFilePath(QString sensorPrefix) { - QDir().mkpath(QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/asteroid-healthloggerd/" + sensorPrefix); + QSettings settings("asteroid","sensorlogd"); //this should be moved out of here at some point TODO + QDir::root().mkpath(settings.value("loggerRootPath",QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/.asteroid-sensorlogd/").toString() + sensorPrefix); } diff --git a/qmlplugin/loggerSettings.cpp b/qmlplugin/loggerSettings.cpp index c03c3c9..58bd4b9 100644 --- a/qmlplugin/loggerSettings.cpp +++ b/qmlplugin/loggerSettings.cpp @@ -9,7 +9,6 @@ */ #include <QDebug> -#include <QStandardPaths> #include "loggerSettings.h" diff --git a/qmlplugin/stepsDataLoader.cpp b/qmlplugin/stepsDataLoader.cpp index cf072c3..0c084ea 100644 --- a/qmlplugin/stepsDataLoader.cpp +++ b/qmlplugin/stepsDataLoader.cpp @@ -12,6 +12,7 @@ #include <QFile> #include <QTextStream> #include <QDate> +#include <QSettings> #include <QStandardPaths> #include "stepsDataLoader.h" @@ -45,5 +46,6 @@ int StepsDataLoader::getDataForDate(QDate date) { // This is obvious garbage. Th } QString fileNameForDate(QDate date, QString prefix) { - return QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/asteroid-healthloggerd/" + prefix + "/" + date.toString("yyyy-MM-dd.log"); + QSettings settings("asteroid","sensorlogd"); //this should be moved out of here at some point TODO + return settings.value("loggerRootPath",QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/.asteroid-sensorlogd/").toString() + prefix + "/" + date.toString("yyyy-MM-dd.log"); } |