jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-10 12:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean

Browse Source
This commit is contained in:
J. Nick Koston
2025-06-29 21:57:50 -05:00
parent 22cb59b88c
commit a054aa9c52
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
esphome/components/web_server_base/web_server_base.cpp
View File

@@ -117,52 +117,44 @@ void OTARequestHandler::handleUpload(AsyncWebServerRequest *request, const Strin
#ifdef USE_ESP_IDF #ifdef USE_ESP_IDF
// ESP-IDF implementation // ESP-IDF implementation
auto *backend = static_cast<ota::OTABackend *>(this->ota_backend_); if (index == 0 && !this->ota_backend_) {
// Initialize OTA on first call
if (index == 0 && !backend) {
// Only initialize once when backend doesn't exist
this->ota_init_(filename.c_str()); this->ota_init_(filename.c_str());
this->ota_success_ = false; // Reset success flag this->ota_success_ = false;
// Create and begin OTA auto backend = ota::make_ota_backend();
auto new_backend = ota::make_ota_backend(); if (backend->begin(0) != ota::OTA_RESPONSE_OK) {
auto result = new_backend->begin(0); ESP_LOGE(TAG, "OTA begin failed");
if (result != ota::OTA_RESPONSE_OK) {
ESP_LOGE(TAG, "OTA begin failed: %d", result);
return; return;
} }
this->ota_backend_ = backend.release();
this->ota_backend_ = new_backend.release();
backend = static_cast<ota::OTABackend *>(this->ota_backend_);
} }
auto *backend = static_cast<ota::OTABackend *>(this->ota_backend_);
if (!backend) { if (!backend) {
return; // Begin failed or was aborted return;
} }
// Write data if provided // Process data
if (len > 0) { if (len > 0) {
auto result = backend->write(data, len); if (backend->write(data, len) != ota::OTA_RESPONSE_OK) {
if (result != ota::OTA_RESPONSE_OK) { ESP_LOGE(TAG, "OTA write failed");
ESP_LOGE(TAG, "OTA write failed: %d", result);
backend->abort(); backend->abort();
delete backend; delete backend;
this->ota_backend_ = nullptr; this->ota_backend_ = nullptr;
return; return;
} }
this->ota_read_length_ += len; this->ota_read_length_ += len;
this->report_ota_progress_(request); this->report_ota_progress_(request);
} }
// Finalize if requested // Finalize
if (final) { if (final) {
auto result = backend->end(); this->ota_success_ = (backend->end() == ota::OTA_RESPONSE_OK);
this->ota_success_ = (result == ota::OTA_RESPONSE_OK);
if (this->ota_success_) { if (this->ota_success_) {
this->schedule_ota_reboot_(); this->schedule_ota_reboot_();
} else { } else {
ESP_LOGE(TAG, "OTA end failed: %d", result); ESP_LOGE(TAG, "OTA end failed");
} }
delete backend; delete backend;
this->ota_backend_ = nullptr; this->ota_backend_ = nullptr;