mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-01-10 04:00:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

[http_request] Store JSON keys in flash for ESP8266 (#13048)

Browse Source
This commit is contained in:
J. Nick Koston
2026-01-07 08:26:04 -10:00
committed by GitHub
parent 21687a1f58
commit ed39a130a8
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
esphome/components/http_request/update/http_request_update.cpp
View File

@@ -93,35 +93,36 @@ void HttpRequestUpdate::update_task(void *params) {
container.reset(); // Release ownership of the container's shared_ptr container.reset(); // Release ownership of the container's shared_ptr
valid = json::parse_json(response, [this_update](JsonObject root) -> bool { valid = json::parse_json(response, [this_update](JsonObject root) -> bool {
if (!root["name"].is<const char *>() || !root["version"].is<const char *>() || !root["builds"].is<JsonArray>()) { if (!root[ESPHOME_F("name")].is<const char *>() || !root[ESPHOME_F("version")].is<const char *>() ||
!root[ESPHOME_F("builds")].is<JsonArray>()) {
ESP_LOGE(TAG, "Manifest does not contain required fields"); ESP_LOGE(TAG, "Manifest does not contain required fields");
return false; return false;
} }
this_update->update_info_.title = root["name"].as<std::string>(); this_update->update_info_.title = root[ESPHOME_F("name")].as<std::string>();
this_update->update_info_.latest_version = root["version"].as<std::string>(); this_update->update_info_.latest_version = root[ESPHOME_F("version")].as<std::string>();
for (auto build : root["builds"].as<JsonArray>()) { for (auto build : root[ESPHOME_F("builds")].as<JsonArray>()) {
if (!build["chipFamily"].is<const char *>()) { if (!build[ESPHOME_F("chipFamily")].is<const char *>()) {
ESP_LOGE(TAG, "Manifest does not contain required fields"); ESP_LOGE(TAG, "Manifest does not contain required fields");
return false; return false;
} }
if (build["chipFamily"] == ESPHOME_VARIANT) { if (build[ESPHOME_F("chipFamily")] == ESPHOME_VARIANT) {
if (!build["ota"].is<JsonObject>()) { if (!build[ESPHOME_F("ota")].is<JsonObject>()) {
ESP_LOGE(TAG, "Manifest does not contain required fields"); ESP_LOGE(TAG, "Manifest does not contain required fields");
return false; return false;
} }
JsonObject ota = build["ota"].as<JsonObject>(); JsonObject ota = build[ESPHOME_F("ota")].as<JsonObject>();
if (!ota["path"].is<const char *>() || !ota["md5"].is<const char *>()) { if (!ota[ESPHOME_F("path")].is<const char *>() || !ota[ESPHOME_F("md5")].is<const char *>()) {
ESP_LOGE(TAG, "Manifest does not contain required fields"); ESP_LOGE(TAG, "Manifest does not contain required fields");
return false; return false;
} }
this_update->update_info_.firmware_url = ota["path"].as<std::string>(); this_update->update_info_.firmware_url = ota[ESPHOME_F("path")].as<std::string>();
this_update->update_info_.md5 = ota["md5"].as<std::string>(); this_update->update_info_.md5 = ota[ESPHOME_F("md5")].as<std::string>();
if (ota["summary"].is<const char *>()) if (ota[ESPHOME_F("summary")].is<const char *>())
this_update->update_info_.summary = ota["summary"].as<std::string>(); this_update->update_info_.summary = ota[ESPHOME_F("summary")].as<std::string>();
if (ota["release_url"].is<const char *>()) if (ota[ESPHOME_F("release_url")].is<const char *>())
this_update->update_info_.release_url = ota["release_url"].as<std::string>(); this_update->update_info_.release_url = ota[ESPHOME_F("release_url")].as<std::string>();
return true; return true;
} }