medvedych/harbour-batterybuddy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle saving and loading config more carefully. Fixes #35

Browse source
This commit is contained in:
Matti Viljanen 2021-04-27 20:13:44 +03:00
parent bd3bfb8365
commit 308f0ae060
No known key found for this signature in database
GPG key ID: CF32A1495158F888
4 changed files with 114 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
application/src/settings.cpp
View file

@ -37,25 +37,20 @@ Settings::Settings(Logger *newLogger, QObject *parent) : QObject(parent)
loadInteger(sLowLimit, lowLimit, 5, 99);
loadInteger(sHighLimit, highLimit, 6, 100);
loadInteger(sLogLevel, logLevel, 0, 2);
logFilename = mySettings->value(sLogFilename).toString();
notificationTitle = tr("Battery charge %1%");
notificationLowText = tr("Please connect the charger.");
notificationHighText = tr("Please disconnect the charger.");
loadString(sLogFilename, logFilename);
loadString(sNotificationTitle, notificationTitle);
loadString(sNotificationLowText, notificationLowText);
loadString(sNotificationHighText, notificationHighText);
saveString(sNotificationTitle, tr("Battery charge %1%"), notificationTitle);
saveString(sNotificationLowText, tr("Please connect the charger."), notificationLowText);
saveString(sNotificationHighText, tr("Please disconnect the charger."), notificationHighText);
}
Settings::~Settings()
{
saveInteger(sLowAlert, lowAlert);
saveInteger(sHighAlert, highAlert);
saveInteger(sHighNotificationsInterval, highNotificationsInterval);
saveInteger(sLowNotificationsInterval, lowNotificationsInterval);
saveInteger(sLimitEnabled, limitEnabled);
saveInteger(sLowLimit, lowLimit);
saveInteger(sHighLimit, highLimit);
mySettings->setValue(sNotificationTitle, notificationTitle);
mySettings->setValue(sNotificationLowText, notificationLowText);
mySettings->setValue(sNotificationHighText, notificationHighText);
mySettings->sync();
logV(QString("Settings saved: %1").arg(mySettings->status() == QSettings::NoError));
}
@ -77,92 +72,105 @@ QString Settings::getNotificationHighText() { return notificationHighText;
int Settings::getLogLevel() { return logLevel; }
void Settings::setLowAlert(const int newLimit) {
lowAlert = newLimit;
saveInteger(sLowAlert, lowAlert);
// Lows and highs are always saved in pairs!
//mySettings->sync();
emit lowAlertChanged(lowAlert);
logD(QString("%1 %2").arg(sLowAlert).arg(newLimit));
if(saveInteger(sLowAlert, newLimit, lowAlert)) {
emit lowAlertChanged(lowAlert);
}
}
void Settings::setHighAlert(const int newLimit) {
highAlert = newLimit;
saveInteger(sHighAlert, highAlert);
mySettings->sync();
emit highAlertChanged(highAlert);
if(saveInteger(sHighAlert, newLimit, highAlert)) {
emit highAlertChanged(highAlert);
}
}
void Settings::setHighNotificationsInterval(const int newInterval) {
highNotificationsInterval = newInterval;
saveInteger(sHighNotificationsInterval, highNotificationsInterval);
mySettings->sync();
emit highNotificationsIntervalChanged(highNotificationsInterval);
if(saveInteger(sHighNotificationsInterval, newInterval, highNotificationsInterval)) {
emit highNotificationsIntervalChanged(highNotificationsInterval);
}
}
void Settings::setLowNotificationsInterval(const int newInterval) {
lowNotificationsInterval = newInterval;
saveInteger(sLowNotificationsInterval, lowNotificationsInterval);
mySettings->sync();
emit highNotificationsIntervalChanged(lowNotificationsInterval);
if(saveInteger(sLowNotificationsInterval, newInterval, lowNotificationsInterval)) {
emit highNotificationsIntervalChanged(lowNotificationsInterval);
}
}
void Settings::setLowLimit(const int newLimit) {
lowLimit = newLimit;
saveInteger(sLowLimit, lowLimit);
// Lows and highs are always saved in pairs!
//mySettings->sync();
emit lowLimitChanged(lowLimit);
if(saveInteger(sLowLimit, newLimit, lowLimit)) {
emit lowLimitChanged(lowLimit);
}
}
void Settings::setHighLimit(const int newLimit) {
highLimit = newLimit;
saveInteger(sHighLimit, highLimit);
mySettings->sync();
emit highLimitChanged(highLimit);
if(saveInteger(sHighLimit, newLimit, highLimit))
emit highLimitChanged(highLimit);
}
void Settings::setLimitEnabled(const bool newEnabled) {
limitEnabled = (newEnabled ? 1 : 0);
saveInteger(sLimitEnabled, limitEnabled);
mySettings->sync();
emit limitEnabledChanged(limitEnabled);
if(saveInteger(sLimitEnabled, (newEnabled ? 1 : 0), limitEnabled))
emit limitEnabledChanged(limitEnabled);
}
void Settings::setNotificationTitle(const QString newText) {
notificationTitle = QString(newText).replace("\"", "\\\"");
mySettings->setValue(sNotificationTitle, notificationTitle);
mySettings->sync();
emit notificationTitleChanged(notificationTitle);
if(saveString(sNotificationTitle, newText, notificationTitle))
emit notificationTitleChanged(notificationTitle);
}
void Settings::setNotificationLowText(const QString newText) {
notificationLowText = QString(newText).replace("\"", "\\\"");
mySettings->setValue(sNotificationLowText, notificationLowText);
mySettings->sync();
emit notificationLowTextChanged(notificationLowText);
if(saveString(sNotificationLowText, newText, notificationLowText))
emit notificationLowTextChanged(notificationLowText);
}
void Settings::setNotificationHighText(const QString newText) {
notificationHighText = QString(newText).replace("\"", "\\\"");
mySettings->setValue(sNotificationHighText, notificationHighText);
mySettings->sync();
emit notificationHighTextChanged(notificationHighText);
if(saveString(sNotificationHighText, newText, notificationHighText))
emit notificationHighTextChanged(notificationHighText);
}
void Settings::setLogLevel(const int newLogLevel) {
logLevel = newLogLevel;
saveInteger(sLogLevel, logLevel);
mySettings->sync();
emit logLevelChanged(logLevel);
if(saveInteger(sLogLevel, newLogLevel, logLevel))
emit logLevelChanged(logLevel);
}
void Settings::loadInteger(const char *key, int &value, const int min, const int max) {
int newValue = mySettings->value(key, value).toInt();
value = (newValue <= min ? min : (newValue >= max ? max : newValue));
logV(QString("Load: %1 %2").arg(key).arg(value));
bool Settings::loadInteger(const char *key, int &currValue, const int min, const int max) {
int newValue = mySettings->value(key, currValue).toInt();
newValue = (newValue <= min ? min : (newValue >= max ? max : newValue));
if(currValue == newValue) {
logD(QString("Load: %1 %2 (unchanged)").arg(key).arg(currValue));
return false;
}
currValue = newValue;
logV(QString("Load: %1 %2").arg(key).arg(currValue));
return true;
}
void Settings::saveInteger(const char* key, const int &value) {
mySettings->setValue(key, QByteArray::number(value));
logV(QString("Save: %1 %2").arg(key).arg(value));
bool Settings::loadString(const char *key, QString & currValue) {
QString newValue = mySettings->value(key, currValue).toString();
if(currValue == newValue) {
logD(QString("Load: %1 %2 (unchanged)").arg(key).arg(currValue));
return false;
}
currValue = newValue;
logV(QString("Load: %1 %2").arg(key).arg(currValue));
return true;
}
bool Settings::saveInteger(const char* key, const int &newValue, int &currValue) {
if(currValue == newValue) {
logD(QString("Save: %1 %2 (unchanged)").arg(key).arg(currValue));
return false;
}
currValue = newValue;
mySettings->setValue(key, QByteArray::number(newValue));
logV(QString("Save: %1 %2").arg(key).arg(newValue));
return true;
}
bool Settings::saveString(const char* key, const QString &newValue, QString &currValue) {
if(currValue == newValue) {
return false;
}
currValue = newValue;
mySettings->setValue(key, QString(newValue).replace("\"", "\\\"").toUtf8());
logV(QString("Save: %1 %2").arg(key).arg(newValue));
return true;
}

7
application/src/settings.h
View file

@ -108,8 +108,11 @@ private:
const char* sLogFilename = "logFilename";
const char* sLogLevel = "logLevel";
void loadInteger(const char *key, int &value, const int min, const int max);
void saveInteger(const char *key, const int &value);
bool loadInteger(const char *key, int &currValue, const int min, const int max);
bool loadString(const char *key, QString & currValue);
bool saveInteger(const char* key, const int &newValue, int &currValue);
bool saveString(const char* key, const QString &newValue, QString &currValue);
void save();
signals:
void lowAlertChanged(int);

49
service/src/settings.cpp
View file

@ -88,29 +88,45 @@ Settings::Settings(Logger* newLogger, QObject *parent) : QObject(parent)
logV(migrate.arg(key));
}
// These are updated and localized from the config file
notificationTitle = "Battery charge %1%";
notificationLowText = "Please connect the charger.";
notificationHighText = "Please disconnect the charger.";
// Do this here, because...
watcher = new QFileSystemWatcher(QStringList(mySettings->fileName()), this);
connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(updateConfig(QString)));
// ...calling this deletes mySettings!
updateConfig(mySettings->fileName());
// Battery Buddy GUI application changes the settings file,
// so we must monitor it and update when it changes.
}
Settings::~Settings() { }
bool Settings::loadInteger(const char *key, int &value, const int min, const int max) {
oldValue = value;
value = mySettings->value(key, value).toInt();
value = (value <= min ? min : (value >= max ? max : value));
if(oldValue != value) {
logV(QString("Load: %1 %2").arg(key).arg(value));
bool Settings::loadInteger(const char *key, int &currValue, const int min, const int max) {
int newValue = mySettings->value(key, currValue).toInt();
newValue = (newValue <= min ? min : (newValue >= max ? max : newValue));
if(currValue == newValue) {
logD(QString("Load: %1 %2 (unchanged)").arg(key).arg(currValue));
return false;
}
return oldValue != value;
currValue = newValue;
logV(QString("Load: %1 %2").arg(key).arg(currValue));
return true;
}
bool Settings::loadString(const char *key, QString & currValue) {
QString newValue = mySettings->value(key, currValue).toString();
if(currValue == newValue) {
logD(QString("Load: %1 %2 (unchanged)").arg(key).arg(currValue));
return false;
}
currValue = newValue;
logV(QString("Load: %1 %2").arg(key).arg(currValue));
return true;
}
void Settings::updateConfig(const QString path) {
// Use the same file location as GUI for data exchange
@ -131,22 +147,19 @@ void Settings::updateConfig(const QString path) {
loadInteger(sLowLimit, lowLimit, 5, 99);
loadInteger(sHighLimit, highLimit, 6, 100);
loadString(sNotificationTitle, notificationTitle);
loadString(sNotificationLowText, notificationLowText);
loadString(sNotificationHighText, notificationHighText);
// Update log level
int oldLogLevel = logLevel;
loadInteger(sLogLevel, logLevel, 0, 2);
if(oldLogLevel != logLevel) {
if(oldLogLevel != logLevel) {
logger->debug = (logLevel == 2);
logger->verbose = (logLevel > 1);
logE(QString("Log level set to %1").arg((logLevel == 0 ? "low" : (logLevel == 1 ? "medium" : "high"))));
}
// These are translated in the GUI application
// and delivered here via the config file
notificationTitle = mySettings->value(sNotificationTitle, "Battery charge %1%").toString();
notificationLowText = mySettings->value(sNotificationLowText, "Please connect the charger.").toString();
notificationHighText = mySettings->value(sNotificationHighText, "Please disconnect the charger.").toString();
delete mySettings;
mySettings = nullptr;

3
service/src/settings.h
View file

@ -94,7 +94,8 @@ private:
const char* sLogFilename = "logFilename";
const char* sLogLevel = "logLevel";
bool loadInteger(const char *key, int &value, const int min, const int max);
bool loadInteger(const char *key, int &currValue, const int min, const int max);
bool loadString(const char *key, QString & currValue);
private slots:
void updateConfig(const QString path);