Merge pull request #120 from ESP32Async/cleanup

Updated serveStatic example

Author: mathieucarbou

examples/StaticFile/StaticFile.ino

@@ -105,6 +105,22 @@ void setup() {
     f.close();
   }
 
+  LittleFS.mkdir("/files");
+
+  {
+    File f = LittleFS.open("/files/a.txt", "w");
+    assert(f);
+    f.print("Hello from a.txt");
+    f.close();
+  }
+
+  {
+    File f = LittleFS.open("/files/b.txt", "w");
+    assert(f);
+    f.print("Hello from b.txt");
+    f.close();
+  }
+
   // curl -v http://192.168.4.1/
   server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
     request->redirect("/index.html");
@@ -113,6 +129,12 @@ void setup() {
   // curl -v http://192.168.4.1/index.html
   server.serveStatic("/index.html", LittleFS, "/index.html");
 
+  // Example to serve a directory content
+  // curl -v http://192.168.4.1/base/ => serves a.txt
+  // curl -v http://192.168.4.1/base/a.txt => serves a.txt
+  // curl -v http://192.168.4.1/base/b.txt => serves b.txt
+  server.serveStatic("/base", LittleFS, "/files").setDefaultFile("a.txt");
+
   server.begin();
 }
 

src/WebHandlerImpl.h

@@ -19,7 +19,6 @@ class AsyncStaticWebHandler : public AsyncWebHandler {
 private:
   bool _getFile(AsyncWebServerRequest *request) const;
   bool _searchFile(AsyncWebServerRequest *request, const String &path);
-  uint8_t _countBits(const uint8_t value) const;
 
 protected:
   FS _fs;

src/WebHandlers.cpp

@@ -187,15 +187,6 @@ bool AsyncStaticWebHandler::_searchFile(AsyncWebServerRequest *request, const St
   return found;
 }
 
-uint8_t AsyncStaticWebHandler::_countBits(const uint8_t value) const {
-  uint8_t w = value;
-  uint8_t n;
-  for (n = 0; w != 0; n++) {
-    w &= w - 1;
-  }
-  return n;
-}
-
 void AsyncStaticWebHandler::handleRequest(AsyncWebServerRequest *request) {
   // Get the filename from request->_tempObject and free it
   String filename((char *)request->_tempObject);