Merge pull request #2850 from ahadcove/fix/restoring_cfg_json

fix: restoring cfg.json #2847
This commit is contained in:
Blaž Kristan 2022-10-24 21:08:50 +02:00 committed by GitHub
commit 779fd78091
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -39,20 +39,20 @@ void handleUpload(AsyncWebServerRequest *request, const String& filename, size_t
if (!index) {
String finalname = filename;
if (finalname.charAt(0) != '/') {
finalname = "/" + finalname; // prepend slash if missing
finalname = '/' + finalname; // prepend slash if missing
}
request->_tempFile = WLED_FS.open(finalname, "w");
DEBUG_PRINT("Uploading ");
DEBUG_PRINT(F("Uploading "));
DEBUG_PRINTLN(finalname);
if (finalname == "/presets.json") presetsModifiedTime = toki.second();
if (finalname.equals("/presets.json")) presetsModifiedTime = toki.second();
}
if (len) {
request->_tempFile.write(data,len);
}
if (final) {
request->_tempFile.close();
if (filename == "/cfg.json") {
if (filename.indexOf(F("cfg.json")) >= 0) { // check for filename with or without slash
doReboot = true;
request->send(200, "text/plain", F("Configuration restore successful.\nRebooting..."));
} else
@ -618,4 +618,4 @@ void serveSettings(AsyncWebServerRequest* request, bool post)
response->addHeader(FPSTR(s_content_enc),"gzip");
setStaticContentCacheHeaders(response);
request->send(response);
}
}