jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 05:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix download option in File Editor

Browse Source
This commit is contained in:
fvanroie 2021-04-30 06:25:07 +02:00
parent dce2fb17d1
commit 9f11cf15f6
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/sys/svc/hasp_http.cpp
View File

@ -367,7 +367,7 @@ void webHandleRoot()
#if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0 #if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0
if(HASP_FS.exists(F("/edit.htm.gz")) || HASP_FS.exists(F("/edit.htm"))) { if(HASP_FS.exists(F("/edit.htm.gz")) || HASP_FS.exists(F("/edit.htm"))) {
httpMessage += F("<p><form method='GET' action='edit.htm?path=/'><button type='submit'>" D_HTTP_FILE_BROWSER httpMessage += F("<p><form method='GET' action='edit.htm?file=/'><button type='submit'>" D_HTTP_FILE_BROWSER
"</button></form></p>"); "</button></form></p>");
} }
#endif #endif
@ -893,22 +893,29 @@ bool handleFileRead(String path)
String pathWithGz = path + F(".gz"); String pathWithGz = path + F(".gz");
if(HASP_FS.exists(pathWithGz) || HASP_FS.exists(path)) { if(HASP_FS.exists(pathWithGz) || HASP_FS.exists(path)) {
if(HASP_FS.exists(pathWithGz)) path += F(".gz"); if(HASP_FS.exists(pathWithGz)) path += F(".gz");
File file = HASP_FS.open(path, "r"); File file = HASP_FS.open(path, "r");
String contentType = getContentType(path);
if(path == F("/edit.htm.gz")) { String contentType;
contentType = F("text/html"); if(webServer.hasArg(F("download")))
} contentType = F("application/octet-stream");
else
contentType = getContentType(path);
// if(path == F("/edit.htm.gz")) {
// contentType = F("text/html");
// }
webServer.streamFile(file, contentType); webServer.streamFile(file, contentType);
file.close(); file.close();
return true; return true;
} }
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
if(path == F("/edit.htm")) {
size_t size = EDIT_HTM_GZ_END - EDIT_HTM_GZ_START; size_t size = EDIT_HTM_GZ_END - EDIT_HTM_GZ_START;
webServer.sendHeader(F("Content-Encoding"), F("gzip")); webServer.sendHeader(F("Content-Encoding"), F("gzip"));
webServer.send_P(200, PSTR("text/html"), (const char*)EDIT_HTM_GZ_START, size); webServer.send_P(200, PSTR("text/html"), (const char*)EDIT_HTM_GZ_START, size);
return true; return true;
}
#else #else
return false; return false;
#endif #endif