Fix WebServer and examples

me-no-dev · me-no-dev · commit c1a6cca5425f · 2018-06-24T18:43:18.000+02:00
diff --git a/libraries/WebServer/examples/FSBrowser/FSBrowser.ino b/libraries/WebServer/examples/FSBrowser/FSBrowser.ino
@@ -82,15 +82,25 @@ String getContentType(String filename) {
   return "text/plain";
 }
 
+bool exists(String path){
+  bool yes = false;
+  File file = SPIFFS.open(path, "r");
+  if(!file.isDirectory()){
+    yes = true;
+  }
+  file.close();
+  return yes;
+}
+
 bool handleFileRead(String path) {
   DBG_OUTPUT_PORT.println("handleFileRead: " + path);
   if (path.endsWith("/")) {
     path += "index.htm";
   }
   String contentType = getContentType(path);
   String pathWithGz = path + ".gz";
-  if (SPIFFS.exists(pathWithGz) || SPIFFS.exists(path)) {
-    if (SPIFFS.exists(pathWithGz)) {
+  if (exists(pathWithGz) || exists(path)) {
+    if (exists(pathWithGz)) {
       path += ".gz";
     }
     File file = SPIFFS.open(path, "r");
@@ -136,7 +146,7 @@ void handleFileDelete() {
   if (path == "/") {
     return server.send(500, "text/plain", "BAD PATH");
   }
-  if (!SPIFFS.exists(path)) {
+  if (!exists(path)) {
     return server.send(404, "text/plain", "FileNotFound");
   }
   SPIFFS.remove(path);
@@ -153,7 +163,7 @@ void handleFileCreate() {
   if (path == "/") {
     return server.send(500, "text/plain", "BAD PATH");
   }
-  if (SPIFFS.exists(path)) {
+  if (exists(path)) {
     return server.send(500, "text/plain", "FILE EXISTS");
   }
   File file = SPIFFS.open(path, "w");
@@ -189,7 +199,7 @@ void handleFileList() {
           output += "{\"type\":\"";
           output += (file.isDirectory()) ? "dir" : "file";
           output += "\",\"name\":\"";
-          output += String(file.name());
+          output += String(file.name()).substring(1);
           output += "\"}";
           file = root.openNextFile();
       }
diff --git a/libraries/WebServer/examples/WebUpdate/WebUpdate.ino b/libraries/WebServer/examples/WebUpdate/WebUpdate.ino
@@ -6,6 +6,7 @@
 #include <WiFiClient.h>
 #include <WebServer.h>
 #include <ESPmDNS.h>
+#include <Update.h>
 
 const char* host = "esp32-webupdate";
 const char* ssid = "........";
diff --git a/libraries/WebServer/src/detail/mimetable.cpp b/libraries/WebServer/src/detail/mimetable.cpp
@@ -5,7 +5,7 @@ namespace mime
 {
 
 // Table of extension->MIME strings stored in PROGMEM, needs to be global due to GCC section typing rules
-const Entry mimeTable[maxType] ICACHE_RODATA_ATTR = 
+const Entry mimeTable[maxType] = 
 {
     { ".html", "text/html" },
     { ".htm", "text/html" },
diff --git a/libraries/WiFi/src/WiFiClient.cpp b/libraries/WiFi/src/WiFiClient.cpp
@@ -240,6 +240,24 @@ size_t WiFiClient::write_P(PGM_P buf, size_t size)
     return write(buf, size);
 }
 
+size_t WiFiClient::write(Stream&stream)
+{
+    uint8_t * buf = (uint8_t *)malloc(1360);
+    if(!buf){
+        return 0;
+    }
+    size_t toRead = 0, toWrite = 0, written = 0;
+    size_t available = stream.available();
+    while(available){
+        toRead = (available > 1360)?1360:available;
+        toWrite = stream.readBytes(buf, toRead);
+        written += write(buf, toWrite);
+        available = stream.available();
+    }
+    free(buf);
+    return written;
+}
+
 int WiFiClient::read(uint8_t *buf, size_t size)
 {
     if(!available()) {
diff --git a/libraries/WiFi/src/WiFiClient.h b/libraries/WiFi/src/WiFiClient.h
@@ -45,6 +45,7 @@ class WiFiClient : public Client
     size_t write(uint8_t data);
     size_t write(const uint8_t *buf, size_t size);
     size_t write_P(PGM_P buf, size_t size);
+    size_t write(Stream&stream);
     int available();
     int read();
     int read(uint8_t *buf, size_t size);

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace mime`
`5`	`5`	`{`
`6`	`6`
`7`	`7`	`// Table of extension->MIME strings stored in PROGMEM, needs to be global due to GCC section typing rules`
`8`		`-const Entry mimeTable[maxType] ICACHE_RODATA_ATTR =`
	`8`	`+const Entry mimeTable[maxType] =`
`9`	`9`	`{`
`10`	`10`	`{ ".html", "text/html" },`
`11`	`11`	`{ ".htm", "text/html" },`