mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2026-05-13 01:25:52 +00:00
fix json uploads
This commit is contained in:
@@ -133,9 +133,10 @@ void UploadFileService::handleUpload(AsyncWebServerRequest * request, const Stri
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (_is_firmware || _is_filesystem) {
|
if (_is_firmware || _is_filesystem) {
|
||||||
if (!request->_tempObject) { // if we haven't delt with an error, continue with the OTA update
|
if (!request->_tempObject) {
|
||||||
|
//continue with the OTA update
|
||||||
if (Update.write(data, len) != len) {
|
if (Update.write(data, len) != len) {
|
||||||
emsesp::EMSESP::logger().err("Update.write failed at offset %u (chunk %u): %s",
|
emsesp::EMSESP::logger().err("OTA update failed at offset %u (chunk %u): %s",
|
||||||
static_cast<unsigned>(Update.progress()),
|
static_cast<unsigned>(Update.progress()),
|
||||||
static_cast<unsigned>(len),
|
static_cast<unsigned>(len),
|
||||||
Update.errorString());
|
Update.errorString());
|
||||||
@@ -144,15 +145,16 @@ void UploadFileService::handleUpload(AsyncWebServerRequest * request, const Stri
|
|||||||
}
|
}
|
||||||
if (final) {
|
if (final) {
|
||||||
if (!Update.end(true)) {
|
if (!Update.end(true)) {
|
||||||
emsesp::EMSESP::logger().err("Update.end failed: %s", Update.errorString());
|
emsesp::EMSESP::logger().err("OTA update failed: %s", Update.errorString());
|
||||||
handleError(request, 500);
|
handleError(request, 500); // internal error, failed
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
if (len && len != request->_tempFile.write(data, len)) { // stream the incoming chunk to the opened file
|
|
||||||
handleError(request, 507); // 507-Insufficient Storage
|
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// stream the incoming chunk to the opened file
|
||||||
|
if (len && len != request->_tempFile.write(data, len)) {
|
||||||
|
handleError(request, 507); // 507-Insufficient Storage
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user