Skip to content

Commit 1f80d60

Browse files
committed
SPIFFSEditor: More PROGMEM
Move a few long strings into PROGMEM.
1 parent 1eb800a commit 1f80d60

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

src/SPIFFSEditor.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ SPIFFSEditor::SPIFFSEditor(const String& username, const String& password, const
285285
{}
286286

287287
bool SPIFFSEditor::canHandle(AsyncWebServerRequest *request){
288-
if(request->url().equalsIgnoreCase("/edit")){
288+
if(request->url().equalsIgnoreCase(F("/edit"))){
289289
if(request->method() == HTTP_GET){
290290
if(request->hasParam("list"))
291291
return true;
@@ -302,9 +302,9 @@ bool SPIFFSEditor::canHandle(AsyncWebServerRequest *request){
302302
}
303303
#endif
304304
}
305-
if(request->hasParam("download")){
306-
if (request->arg("download").indexOf("wsec") > -1) return false; //make sure wsec.json is not served
307-
request->_tempFile = _fs.open(request->arg("download"), "r");
305+
if(request->hasParam(F("download"))){
306+
if (request->arg(F("download")).indexOf("wsec") > -1) return false; //make sure wsec.json is not served
307+
request->_tempFile = _fs.open(request->arg(F("download")), "r");
308308
if(!request->_tempFile){
309309
return false;
310310
}
@@ -315,7 +315,7 @@ bool SPIFFSEditor::canHandle(AsyncWebServerRequest *request){
315315
}
316316
#endif
317317
}
318-
request->addInterestingHeader("If-Modified-Since");
318+
request->addInterestingHeader(F("If-Modified-Since"));
319319
return true;
320320
}
321321
else if(request->method() == HTTP_POST)
@@ -354,10 +354,10 @@ void SPIFFSEditor::handleRequest(AsyncWebServerRequest *request){
354354
String fname = entry.name();
355355
if (fname.indexOf("wsec") == -1) {
356356
if (output != "[") output += ',';
357-
output += "{\"type\":\"file\",\"name\":\"";
357+
output += F("{\"type\":\"file\",\"name\":\"");
358358
if (fname[0] != '/') output += '/';
359359
output += fname;
360-
output += "\",\"size\":";
360+
output += F("\",\"size\":");
361361
output += String(entry.size());
362362
output += '}';
363363
}
@@ -371,20 +371,20 @@ void SPIFFSEditor::handleRequest(AsyncWebServerRequest *request){
371371
dir.close();
372372
#endif
373373
output += ']';
374-
request->send(200, "application/json", output);
374+
request->send(200, FPSTR(CONTENT_TYPE_JSON), output);
375375
output = String();
376376
}
377-
else if(request->hasParam("edit") || request->hasParam("download")){
378-
request->send(request->_tempFile, request->_tempFile.name(), String(), request->hasParam("download"));
377+
else if(request->hasParam("edit") || request->hasParam(F("download"))){
378+
request->send(request->_tempFile, request->_tempFile.name(), String(), request->hasParam(F("download")));
379379
}
380380
else {
381381
const char * buildTime = __DATE__ " " __TIME__ " GMT";
382-
if (request->header("If-Modified-Since").equals(buildTime)) {
382+
if (request->header(F("If-Modified-Since")).equals(buildTime)) {
383383
request->send(304);
384384
} else {
385-
AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", edit_htm_gz, edit_htm_gz_len);
386-
response->addHeader("Content-Encoding", "gzip");
387-
response->addHeader("Last-Modified", buildTime);
385+
AsyncWebServerResponse *response = request->beginResponse_P(200, FPSTR(CONTENT_TYPE_HTML), edit_htm_gz, edit_htm_gz_len);
386+
response->addHeader(F("Content-Encoding"), F("gzip"));
387+
response->addHeader(F("Last-Modified"), buildTime);
388388
request->send(response);
389389
}
390390
}

0 commit comments

Comments
 (0)