arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-12 01:53:07 +03:00
Code Activity

Make getContentType available for 3rd party usage (#7254)

Browse Source 
* Refactored to make getContentType public for 3rd party use.

* Added missing "jpeg" extension

* Use getContentType() from mime namespace.

* Also add .jpeg extension
This commit is contained in:
vdeconinck
2020-04-30 05:36:42 +02:00
committed by GitHub
parent 668b33ddf1
commit a9cf12fcf0
4 changed files with 26 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
libraries/ESP8266WebServer/examples/FSBrowser/FSBrowser.ino
View File

@ -115,49 +115,6 @@ void replyServerError(String msg) {
server.send(500, FPSTR(TEXT_PLAIN), msg + "\r\n");
}
String getContentType(String filename) {
if (filename.endsWith(".htm")) {
return "text/html";
}
if (filename.endsWith(".html")) {
return "text/html";
}
if (filename.endsWith(".css")) {
return "text/css";
}
if (filename.endsWith(".js")) {
return "application/javascript";
}
if (filename.endsWith(".png")) {
return "image/png";
}
if (filename.endsWith(".gif")) {
return "image/gif";
}
if (filename.endsWith(".jpg")) {
return "image/jpeg";
}
if (filename.endsWith(".jpeg")) {
return "image/jpeg";
}
if (filename.endsWith(".ico")) {
return "image/x-icon";
}
if (filename.endsWith(".xml")) {
return "text/xml";
}
if (filename.endsWith(".pdf")) {
return "application/x-pdf";
}
if (filename.endsWith(".zip")) {
return "application/x-zip";
}
if (filename.endsWith(".gz")) {
return "application/x-gzip";
}
return FPSTR(TEXT_PLAIN);
}
#ifdef USE_SPIFFS
/*
Checks filename for character combinations that are not supported by FSBrowser (alhtough valid on SPIFFS).
@ -304,7 +261,7 @@ bool handleFileRead(String path) {
if (server.hasArg("download")) {
contentType = F("application/octet-stream");
} else {
contentType = getContentType(path);
contentType = mime::getContentType(path);
}
if (!fileSystem->exists(path)) {