Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-13 11:47:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

settings: simplify migrateVersion() checks in modules

Browse Source 
Just `if (version < N)` instead of `if (version && (version < N))`
Fix existing functions that were not checking for `version > 0`
This commit is contained in:
Maxim Prokhorov
2021-08-02 07:50:52 +03:00
parent dde5f374dd
commit 27f701773f
12 changed files with 101 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
code/espurna/migrate.cpp
View File

@@ -48,11 +48,18 @@ void delSettingPrefix(const String& prefix) {
int migrateVersion() {
const static auto version = getSetting("cfg", CFG_VERSION);
if (version == CFG_VERSION) {
return 0;
if (version != CFG_VERSION) {
return version;
}
return version;
return 0;
}
void migrateVersion(MigrateVersionCallback callback) {
int version = migrateVersion();
if (version) {
callback(version);
}
}
void migrate() {
@@ -61,19 +68,17 @@ void migrate() {
const auto version = migrateVersion();
setSetting("cfg", CFG_VERSION);
if (!version) {
return;
}
// get rid of old keys that were never used until now
// and some very old keys that were forced via migrate.ino
switch (version) {
case 2:
case 3:
case 4:
delSetting("board");
break;
}
if (version) {
switch (version) {
case 2:
case 3:
case 4:
delSetting("board");
break;
}
saveSettings();
saveSettings();
}
}