fix #124 auto upgrade

yakumo-saki · Jan 23, 2023 · 461750f · 461750f
1 parent 8a911ef
commit 461750f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/include/config/config.h b/include/config/config.h
@@ -7,6 +7,8 @@
 #include "config_values.h"
 #include "ConfigClass.h"
 
+extern const String CFG_VERSION_INVALID;
+
 enum struct CFG_VALIDATE_RESULT {
   // 存在していて、バージョンも一致している
   VALID,

diff --git a/src/config/config.cpp b/src/config/config.cpp
@@ -12,6 +12,8 @@
 #include "config_names.h"
 
 const unsigned int CONF_JSON_SIZE = 4000;
+extern const String CFG_VERSION_INVALID = "INVALID";
+
 
 DynamicJsonDocument _create_config_json(bool save, const std::vector<String> &keyArray) {
 
@@ -119,12 +121,12 @@ String read_config_setting_id(File f) {
   DeserializationError error = deserializeJson(doc, f);
 
   if (error) {
-    return "INVALID";
+    return CFG_VERSION_INVALID;
   }
 
   JsonVariant value = doc[ConfigNames::SETTING_ID];
   if (value.isNull()) {
-    return "INVALID"; // JSON not contains SETTING_ID
+    return CFG_VERSION_INVALID; // JSON not contains SETTING_ID
   }
 
   return value.as<String>();

diff --git a/src/config/config_file.cpp b/src/config/config_file.cpp
@@ -71,7 +71,10 @@ CFG_VALIDATE_RESULT has_valid_config_file() {
     settingId = read_config_setting_id(f);
     f.close();
 
-    if (String(SETTING_ID).equals(settingId)) {
+    if (settingId.equals(CFG_VERSION_INVALID)) {
+      cfglog("SETTING_ID not found. INVALID config.");
+      return CFG_VALIDATE_RESULT::ERROR;
+    } else if (String(SETTING_ID).equals(settingId)) {
       cfglog("SETTING_ID verified. " + settingId);
       return CFG_VALIDATE_RESULT::VALID;
     } else {
@@ -80,7 +83,7 @@ CFG_VALIDATE_RESULT has_valid_config_file() {
     }
   }
 
-  cfglog("Unknown state. Assuming config not found");
+  cfglog("Unknown state. Assuming config not found. " + settingId);
   return CFG_VALIDATE_RESULT::ERROR;
 }
 
@@ -102,6 +105,7 @@ bool has_configured_file() {
   return true;
 }
 
+/** ファイルシステムのマウント */
 void config_setup() {
 
   if (!LittleFS.begin()) {

diff --git a/src/main.cpp b/src/main.cpp
@@ -41,7 +41,10 @@ void setup()
   if (validateResult == CFG_VALIDATE_RESULT::VALID) {
     mainlog(F("Config file is valid."));
   } else if (validateResult == CFG_VALIDATE_RESULT::NEED_UPGRADE) {
-    mainlog(F("Config file needs upgrade."));
+    sectionlog(F("Config file needs upgrade. upgrading..."));
+    read_config();
+    save_config();  // upgrade means json + default, so only saving is needed.
+    sectionlog(F("Config file upgrade done!"));
   } else {
     mainlog(F("Config file validation error. dropping to setup mode."));
     isNormal = false;

diff --git a/src/main_normal.cpp b/src/main_normal.cpp
@@ -143,7 +143,7 @@ void setup_normal() {
   sectionlog(F("Start watchdog"));
   setup_watchdog();
 
-  // setupモードに入りやすくするための処理
+  // setupモードに入りやすくするための処理(deprecated)
   if (config->get(ConfigNames::DISPLAY_RECONFIG) == ConfigValues::DISPLAY_RECONFIG_ON) {
     sectionlog(F("Reset to reconfig start."));
     remove_configure_flag_file();