move http and ota to lib/ for testing, add #pragma once include guards

lib/httpserver/filesys.cpp

@@ -0,0 +1,130 @@
+#include "filesys.h"
+
+// listDir("/");
+// deleteFile("/hello.txt");
+// writeFile("/hello.txt", "Hello ");
+// appendFile("/hello.txt", "World!\n\r");
+// readFile("/hello.txt");
+// listDir("/");
+
+FSInfo fsinfo;
+
+bool mount_fs() {
+  if(!LittleFS.begin()) {
+    Serial.println("[ERROR] LittleFS.info(), reset ...");
+    return false;
+  }
+
+  if(!LittleFS.info(fsinfo)) {
+    Serial.println("[ERROR] LittleFS.info(), reset ...");
+    return false;
+  }
+
+  printf("Filesystem opened:\n\r");
+  printf("\ttotalBytes:\t%d\n\r",     fsinfo.totalBytes);
+  printf("\tusedBytes:\t%d\n\r",      fsinfo.usedBytes);
+  printf("\tblockSize:\t%d\n\r",      fsinfo.blockSize);
+  printf("\tpageSize:\t%d\n\r",       fsinfo.pageSize);
+  printf("\tmaxOpenFiles:\t%d\n\r",   fsinfo.maxOpenFiles);
+  printf("\tmaxPathLength:\t%d\n\r",  fsinfo.maxPathLength);
+  printf("\n\r");
+
+  return true;
+}
+
+bool format_fs() {
+  printf("Formatting FS ! \n\r");
+  return LittleFS.format();
+}
+
+void ls(const char * dirname) {
+  Serial.printf("ls -l %s\n\r", dirname);
+  Dir root = LittleFS.openDir(dirname);
+
+  while (root.next()) {
+    File file = root.openFile("r");
+
+    time_t lw = file.getLastWrite();
+    struct tm * tmstruct = localtime(&lw);
+    Serial.printf("%8d  %02d %02d %02d:%02d  %s\n\r",
+        file.size(), 
+        tmstruct->tm_mon + 1, 
+        tmstruct->tm_mday,
+        tmstruct->tm_hour,
+        tmstruct->tm_min,
+        root.fileName().c_str());
+    file.close();
+  }
+  Serial.println();
+}
+
+void readFile(const char * path) {
+  Serial.printf("Reading file: %s\n\r", path);
+
+  File file = LittleFS.open(path, "r");
+  if (!file) {
+    Serial.println("Failed to open file for reading");
+    return;
+  }
+
+  Serial.print("Read from file: ");
+  while (file.available()) {
+    Serial.write(file.read());
+  }
+  file.close();
+}
+
+void writeFile(const char * path, const char * message) {
+  Serial.printf("Writing file: %s\n\r", path);
+
+  File file = LittleFS.open(path, "w");
+  if (!file) {
+    Serial.println("Failed to open file for writing");
+    return;
+  }
+  if (file.print(message)) {
+    Serial.println("File written");
+  } else {
+    Serial.println("Write failed");
+  }
+  delay(2000); // Make sure the CREATE and LASTWRITE times are different
+  file.close();
+}
+
+void appendFile(const char * path, const char * message) {
+  Serial.printf("Appending to file: %s\n\r", path);
+
+  File file = LittleFS.open(path, "a");
+  if (!file) {
+    Serial.println("Failed to open file for appending");
+    return;
+  }
+  if(file.print(message)) {
+    Serial.println("Message appended");
+  } else {
+    Serial.println("Append failed");
+  }
+  file.close();
+}
+
+void renameFile(const char * path1, const char * path2) {
+  Serial.printf("Renaming file %s to %s\n\r", path1, path2);
+  if (LittleFS.rename(path1, path2)) {
+    Serial.println("File renamed");
+  } else {
+    Serial.println("Rename failed");
+  }
+}
+
+void deleteFile(const char * path) {
+  Serial.printf("Deleting file: %s\n\r", path);
+  if (LittleFS.remove(path)) {
+    Serial.println("File deleted");
+  } else {
+    Serial.println("Delete failed");
+  }
+}
+
+
+
+ 

lib/httpserver/filesys.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <LittleFS.h>
+
+bool mount_fs();
+bool format_fs();
+
+void ls(const char * dirname);
+void readFile(const char * path);
+void writeFile(const char * path, const char * message);
+void appendFile(const char * path, const char * message);
+void renameFile(const char * path1, const char * path2);
+void deleteFile(const char * path);

lib/httpserver/httpserver.cpp

@@ -0,0 +1,17 @@
+#include "httpserver.h"
+
+
+bool HTTPServer::addRootFileHandler() {
+
+  // //experimental, see doku.md
+  // server.serveStatic("/compressed", LittleFS, "/compressed.html.gzip");
+
+  this->serveStatic("", LittleFS, "/index.html");
+  this->serveStatic("/", LittleFS, "/index.html");
+  this->serveStatic("/#", LittleFS, "/index.html");
+  this->serveStatic("/style.css", LittleFS, "/style.css");
+  this->serveStatic("/input.js", LittleFS, "/input.js");
+  this->serveStatic("/favicon.png", LittleFS, "/favicon.png");
+
+  return true;
+}

lib/httpserver/httpserver.h

@@ -0,0 +1,44 @@
+#pragma once
+
+#include "filesys.h"
+#include <ESP8266WebServer.h>
+
+class HTTPServer : public ESP8266WebServer {
+private:
+    const char* rootDir;
+ 
+    bool addRootFileHandler();
+    bool formatFS() {
+        return format_fs();
+    }
+    void listRoot() {
+        ls(rootDir);
+    }
+
+public:
+    HTTPServer(const int _port, const char* _rootDir) :
+       ESP8266WebServer(_port), rootDir(_rootDir)
+    { }
+    ~HTTPServer() 
+    {
+        Serial.printf("[HTTPServer] shut down ...\n\r");
+    }
+
+    bool start() {
+        if(!mount_fs())
+            return false;
+        Serial.printf("[HTTPServer] LittleFS mounted !\n\r");
+
+        Serial.printf("[HTTPServer] root:\n\r");
+        this->listRoot();
+        Serial.printf("\n\r");
+
+        if( this->addRootFileHandler() ){
+            this->begin();
+            Serial.printf("[HTTPServer] Server active on Port 80 !\n\r");
+            return true;
+        }
+        Serial.printf("[HTTPServer] Not starting Server, something went wrong !\n\r");
+        return false;
+    }
+};