schmidtsi76327/ESP8266_Treppenlicht
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lambda error

Browse Source
This commit is contained in:
Simon Schmidt 2021-06-26 21:11:19 +02:00
parent b89604edc3
commit 9ea541a1b4
2 changed files with 68 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/httpserver/httpserver.cpp
View File

@ -15,3 +15,28 @@ bool HTTPServer::addRootFileHandler() {
return true; return true;
} }
bool HTTPServer::addRootFileHandler_ls() {
logf("addRootFileHandler_ls: %s\n\r", rootDir);
Dir root = LittleFS.openDir(rootDir);
while (root.next()) {
const String& fName = "/" + root.fileName();
const String& fName_gz = "/" + root.fileName() + ".gz";
Serial.printf("Register Callback for: %s @ %s\n\r",
fName.c_str(), fName_gz.c_str());
// https://stackoverflow.com/questions/7627098/what-is-a-lambda-expression-in-c11
on(fName, [this, fName, fName_gz]() {
logf("addRootFileHandler_ls: %s\n\r", rootDir);
File f = open(fName_gz.c_str());
if (f)
streamFile(f, mime::getContentType(fName));
else
send(404, "text/plain", "Failed to open file for reading");
});
}
return true;
}

72
lib/httpserver/httpserver.h
View File

@ -2,18 +2,30 @@
#include "filesys.h" #include "filesys.h"
#include <ESP8266WebServer.h> #include <ESP8266WebServer.h>
#include <stdarg.h>
#define LOG_STR "[HTTPServer]"
class HTTPServer : public ESP8266WebServer { class HTTPServer : public ESP8266WebServer {
private: private:
const char* rootDir; const char* rootDir = "/";
bool addRootFileHandler(); bool addRootFileHandler();
bool addRootFileHandler_ls();
bool formatFS() { bool formatFS() {
return format_fs(); return format_fs();
} }
void listRoot() { void listRoot() {
ls(rootDir); ls(rootDir);
} }
void logf(const char *format, ...) {
va_list args;
va_start(args, format);
Serial.print(LOG_STR);
Serial.printf(format, args);
va_end(args);
}
public: public:
HTTPServer(const int _port, const char* _rootDir) : HTTPServer(const int _port, const char* _rootDir) :
@ -33,33 +45,34 @@ public:
this->listRoot(); this->listRoot();
Serial.printf("\n\r"); Serial.printf("\n\r");
// https://stackoverflow.com/questions/7627098/what-is-a-lambda-expression-in-c11 // on("/compress.html", [this]() {
on("/compress.html", [this]() { // File f = open("/compress.html.gz");
File f = open("/compress.html.gz"); // if (!f) {
if (!f) { // Serial.println("Failed to open file for reading");
Serial.println("Failed to open file for reading"); // send(404, "text/plain", "Failed to open file for reading");
send(404, "text/plain", "Failed to open file for reading"); // }
} // else
else // {
{ // Serial.println("Streaming /compress.html.gz to client");
Serial.println("Streaming /compress.html.gz to client"); // const String cont = "text/html";
const String cont = "text/html"; // streamFile(f, cont);
streamFile(f, cont); // }
} // f.close();
}); // });
on("/comp.html", [this]() { // on("/comp.html", [this]() {
File f = open("/comp.html.gz"); // File f = open("/comp.html.gz");
if (!f) { // if (!f) {
Serial.println("Failed to open file for reading"); // Serial.println("Failed to open file for reading");
send(404, "text/plain", "Failed to open file for reading"); // send(404, "text/plain", "Failed to open file for reading");
} // }
else // else
{ // {
Serial.println("Streaming /comp.html.gz to client"); // Serial.println("Streaming /comp.html.gz to client");
const String cont = "text/html"; // const String cont = "text/html";
streamFile(f, cont); // streamFile(f, cont);
} // }
}); // f.close();
// });
on("/terminal", [this]() { on("/terminal", [this]() {
String log_msg = "terminal: millis: "; String log_msg = "terminal: millis: ";
@ -67,6 +80,7 @@ public:
send(200, "text/plain", log_msg); send(200, "text/plain", log_msg);
}); });
// default handler
onNotFound([this]() { onNotFound([this]() {
String message = "File Not Found\n\n"; String message = "File Not Found\n\n";
message += "URI: "; message += "URI: ";
@ -83,7 +97,7 @@ public:
send(404, "text/plain", message); send(404, "text/plain", message);
}); });
if( this->addRootFileHandler() ){ if( this->addRootFileHandler_ls() ){
this->begin(); this->begin();
Serial.printf("[HTTPServer] Server active on Port 80 !\n\r"); Serial.printf("[HTTPServer] Server active on Port 80 !\n\r");
return true; return true;