lbsadmin/ESPUI
1
0
Fork 0
mirror of https://github.com/s00500/ESPUI.git synced 2024-11-22 14:20:53 +00:00
Code Issues Releases Activity

ixing filelist functions for esp8266

Browse Source
This commit is contained in:
Lukas Bachschwell 2018-01-14 12:22:26 +01:00
parent 7e4dbd7e03
commit 5f7f8dd4e5
2 changed files with 151 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library.properties
View File

@ -1,5 +1,5 @@
name=ESPUI name=ESPUI
version=1.4.4 version=1.4.5
author=Lukas Bachschwell author=Lukas Bachschwell
maintainer=Lukas Bachschwell <lukas@lbsfilm.at> maintainer=Lukas Bachschwell <lukas@lbsfilm.at>
sentence=ESP32 and ESP8266 Web Interface Library sentence=ESP32 and ESP8266 Web Interface Library

267
src/ESPUI.cpp
View File

@ -2,145 +2,175 @@
#include "uploadDataIndex.h" #include "uploadDataIndex.h"
#include "uploadDataStyle.h"
#include "uploadDataNormalize.h" #include "uploadDataNormalize.h"
#include "uploadDataStyle.h"
#include "uploadDataControls.h" #include "uploadDataControls.h"
#include "uploadDataZepto.h"
#include "uploadDataSlider.h" #include "uploadDataSlider.h"
#include "uploadDataZepto.h"
#include <ESPAsyncWebServer.h> #include <ESPAsyncWebServer.h>
#include <functional> #include <functional>
// ################# Spiffs functions // ################# Spiffs functions
#if defined(ESP32)
void listDir(const char *dirname, uint8_t levels) {
Serial.printf("Listing directory: %s\n", dirname);
void listDir(const char * dirname, uint8_t levels){ File root = SPIFFS.open(dirname);
Serial.printf("Listing directory: %s\n", dirname);
File root = SPIFFS.open(dirname); if (!root) {
if(!root){ Serial.println("Failed to open directory");
Serial.println("Failed to open directory"); return;
return; }
}
if(!root.isDirectory()){ if (!root.isDirectory()) {
Serial.println("Not a directory"); Serial.println("Not a directory");
return; return;
}
File file = root.openNextFile();
while (file) {
if (file.isDirectory()) {
Serial.print(" DIR : ");
Serial.println(file.name());
if (levels) {
listDir(file.name(), levels - 1);
}
} else {
Serial.print(" FILE: ");
Serial.print(file.name());
Serial.print(" SIZE: ");
Serial.println(file.size());
} }
File file = root.openNextFile(); file = root.openNextFile();
while(file){ }
if(file.isDirectory()){ }
Serial.print(" DIR : "); #else
Serial.println(file.name());
if(levels){ void listDir(const char *dirname, uint8_t levels) {
listDir(file.name(), levels -1); // ignoring levels for esp8266
} Serial.printf("Listing directory: %s\n", dirname);
} else {
Serial.print(" FILE: "); String str = "";
Serial.print(file.name()); Dir dir = SPIFFS.openDir("/");
Serial.print(" SIZE: "); while (dir.next()) {
Serial.println(file.size()); Serial.print(" FILE: ");
} Serial.print(dir.fileName());
file = root.openNextFile(); Serial.print(" SIZE: ");
} Serial.println(dir.fileSize());
}
} }
void deleteFile(const char * path) { #endif
void ESPUIClass::list() {
if (!SPIFFS.begin()) {
Serial.println("SPIFFS Mount Failed");
return;
}
listDir("/", 1);
#if defined(ESP32)
Serial.println(SPIFFS.totalBytes());
Serial.println(SPIFFS.usedBytes());
#else
FSInfo fs_info;
SPIFFS.info(fs_info);
Serial.println(fs_info.totalBytes);
Serial.println(fs_info.usedBytes);
#endif
}
void deleteFile(const char *path) {
Serial.print(SPIFFS.exists(path)); Serial.print(SPIFFS.exists(path));
if(!SPIFFS.exists(path)){ if (!SPIFFS.exists(path)) {
Serial.printf("File: %s does not exist, not deleting\n", path); Serial.printf("File: %s does not exist, not deleting\n", path);
return; return;
} }
Serial.printf("Deleting file: %s\n", path); Serial.printf("Deleting file: %s\n", path);
if(SPIFFS.remove(path)){ if (SPIFFS.remove(path)) {
Serial.println("File deleted"); Serial.println("File deleted");
} else { } else {
Serial.println("Delete failed"); Serial.println("Delete failed");
} }
} }
void writeFile(const char * path, const char * data) { void writeFile(const char *path, const char *data) {
Serial.printf("Writing file: %s\n", path); Serial.printf("Writing file: %s\n", path);
File file = SPIFFS.open(path, FILE_WRITE); File file = SPIFFS.open(path, FILE_WRITE);
if(!file){ if (!file) {
Serial.println("Failed to open file for writing"); Serial.println("Failed to open file for writing");
return; return;
} }
if(file.print(FPSTR(data))){ if (file.print(FPSTR(data))) {
Serial.println("File written"); Serial.println("File written");
} else { } else {
Serial.println("Write failed"); Serial.println("Write failed");
} }
file.close(); file.close();
} }
// end Spiffs functions // end Spiffs functions
void ESPUIClass::prepareFileSystem(){ void ESPUIClass::prepareFileSystem() {
// this function should only be used once // this function should only be used once
Serial.println("About to prepare filesystem..."); Serial.println("About to prepare filesystem...");
#if defined(ESP32) #if defined(ESP32)
SPIFFS.format(); SPIFFS.format();
if(!SPIFFS.begin(true)) { if (!SPIFFS.begin(true)) {
Serial.println("SPIFFS Mount Failed"); Serial.println("SPIFFS Mount Failed");
return; return;
} }
Serial.println("SPIFFS Mount ESP32 Done"); listDir("/", 1);
Serial.println("SPIFFS Mount ESP32 Done");
#else #else
SPIFFS.format(); SPIFFS.format();
SPIFFS.begin(); SPIFFS.begin();
Serial.println("SPIFFS Mount ESP8266 Done"); Serial.println("SPIFFS Mount ESP8266 Done");
#endif #endif
listDir("/", 1); // TODO: This is a workaround, have to find out why SPIFFS on ESP32 behaves
// incredibly strangely, see issue #6
/*
deleteFile("/index.htm");
//TODO: This is a workaround, have to find out why SPIFFS on ESP32 behaves incredibly strangely, see issue #6 deleteFile("/css/style.css");
/* deleteFile("/css/normalize.css");
deleteFile("/index.htm");
deleteFile("/css/style.css"); deleteFile("/js/zepto.min.js");
deleteFile("/css/normalize.css"); deleteFile("/js/controls.js");
deleteFile("/js/slider.js");
*/
deleteFile("/js/zepto.min.js"); Serial.println("Cleanup done");
deleteFile("/js/controls.js");
deleteFile("/js/slider.js");
*/
Serial.println("Cleanup done"); // Now write
writeFile("/index.htm", HTML_INDEX);
// Now write writeFile("/css/style.css", CSS_STYLE);
writeFile("/index.htm", HTML_INDEX); writeFile("/css/normalize.css", CSS_NORMALIZE);
writeFile("/css/style.css", CSS_STYLE); writeFile("/js/zepto.min.js", JS_ZEPTO);
writeFile("/css/normalize.css", CSS_NORMALIZE); writeFile("/js/controls.js", JS_CONTROLS);
writeFile("/js/slider.js", JS_SLIDER);
writeFile("/js/zepto.min.js", JS_ZEPTO); Serial.println("Done Initializing filesystem :-)");
writeFile("/js/controls.js", JS_CONTROLS);
writeFile("/js/slider.js", JS_SLIDER);
Serial.println("Done Initializing filesystem :-)"); #if defined(ESP32)
listDir("/", 1);
SPIFFS.end();
}
void ESPUIClass::list() {
if(!SPIFFS.begin()) {
Serial.println("SPIFFS Mount Failed");
return;
}
listDir("/", 1); listDir("/", 1);
#endif
Serial.println(SPIFFS.totalBytes()); SPIFFS.end();
Serial.println(SPIFFS.usedBytes());
} }
// Handle Websockets Communication // Handle Websockets Communication
void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client,
AwsEventType type, void *arg, uint8_t *data, size_t len) { AwsEventType type, void *arg, uint8_t *data, size_t len) {
@ -150,28 +180,29 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client,
Serial.printf("Disconnected!\n"); Serial.printf("Disconnected!\n");
break; break;
case WS_EVT_CONNECT: { case WS_EVT_CONNECT: {
if (debug){ if (debug) {
Serial.print("Connected: "); Serial.print("Connected: ");
Serial.println(client->id()); Serial.println(client->id());
} }
ESPUI.jsonDom(client); ESPUI.jsonDom(client);
if (debug){ if (debug) {
Serial.println("JSON Data Sent to Client!"); Serial.println("JSON Data Sent to Client!");
} }
} } break;
break;
case WS_EVT_DATA: case WS_EVT_DATA:
String msg = ""; String msg = "";
for (size_t i = 0; i < len; i++) { for (size_t i = 0; i < len; i++) {
msg += (char)data[i]; msg += (char)data[i];
} }
int id = msg.substring(msg.lastIndexOf(':') + 1).toInt(); int id = msg.substring(msg.lastIndexOf(':') + 1).toInt();
if (id >= ESPUI.cIndex){ if (id >= ESPUI.cIndex) {
if(debug) Serial.println("Maleformated id in websocket message"); if (debug)
Serial.println("Maleformated id in websocket message");
return; return;
} }
Control *c = ESPUI.controls[msg.substring(msg.lastIndexOf(':') + 1).toInt()]; Control *c =
ESPUI.controls[msg.substring(msg.lastIndexOf(':') + 1).toInt()];
if (msg.startsWith("bdown:")) { if (msg.startsWith("bdown:")) {
c->callback(*c, B_DOWN); c->callback(*c, B_DOWN);
@ -204,7 +235,8 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client,
ESPUI.updateSwitcher(c->id, false); ESPUI.updateSwitcher(c->id, false);
c->callback(*c, S_INACTIVE); c->callback(*c, S_INACTIVE);
} else if (msg.startsWith("slvalue:")) { } else if (msg.startsWith("slvalue:")) {
int value = msg.substring(msg.indexOf(':') + 1, msg.lastIndexOf(':')).toInt(); int value =
msg.substring(msg.indexOf(':') + 1, msg.lastIndexOf(':')).toInt();
ESPUI.updateSlider(c->id, value, client->id()); ESPUI.updateSlider(c->id, value, client->id());
c->callback(*c, SL_VALUE); c->callback(*c, SL_VALUE);
} }
@ -235,7 +267,8 @@ void ESPUIClass::label(const char *label, int color, String value) {
} }
// TODO: this still needs a range setting // TODO: this still needs a range setting
void ESPUIClass::slider(const char *label, void (*callBack)(Control, int), int color, String value) { void ESPUIClass::slider(const char *label, void (*callBack)(Control, int),
int color, String value) {
if (labelExists(label)) { if (labelExists(label)) {
if (debug) if (debug)
Serial.println("UI ERROR: Element " + String(label) + Serial.println("UI ERROR: Element " + String(label) +
@ -351,7 +384,7 @@ void ESPUIClass::print(String label, String value) {
print(getIdByLabel(label), value); print(getIdByLabel(label), value);
} }
void ESPUIClass::updateSwitcher(int id, bool nValue, int clientId ) { void ESPUIClass::updateSwitcher(int id, bool nValue, int clientId) {
if (id < cIndex && controls[id]->type == UI_SWITCHER) { if (id < cIndex && controls[id]->type == UI_SWITCHER) {
controls[id]->value = nValue ? 1 : 0; controls[id]->value = nValue ? 1 : 0;
String json; String json;
@ -369,7 +402,7 @@ void ESPUIClass::updateSwitcher(int id, bool nValue, int clientId ) {
} }
} }
void ESPUIClass::updateSlider(int id, int nValue, int clientId ) { void ESPUIClass::updateSlider(int id, int nValue, int clientId) {
if (id < cIndex && controls[id]->type == UI_SLIDER) { if (id < cIndex && controls[id]->type == UI_SLIDER) {
controls[id]->value = nValue; controls[id]->value = nValue;
String json; String json;
@ -382,8 +415,7 @@ void ESPUIClass::updateSlider(int id, int nValue, int clientId ) {
textThem(json, clientId); textThem(json, clientId);
} else { } else {
if (debug) if (debug)
Serial.println(String("Error: ") + String(id) + Serial.println(String("Error: ") + String(id) + String(" is no slider"));
String(" is no slider"));
} }
} }
@ -397,12 +429,13 @@ void ESPUIClass::updateSwitcher(String label, bool nValue, int clientId) {
updateSwitcher(getIdByLabel(label), nValue, clientId); updateSwitcher(getIdByLabel(label), nValue, clientId);
} }
// This is a hacky workaround because ESPAsyncWebServer does not have a function like this and it's clients array is private // This is a hacky workaround because ESPAsyncWebServer does not have a function
void ESPUIClass::textThem(String text, int clientId){ // like this and it's clients array is private
void ESPUIClass::textThem(String text, int clientId) {
int tryId = 0; int tryId = 0;
for(int count = 0; count < this->ws->count();){ for (int count = 0; count < this->ws->count();) {
if(this->ws->hasClient(tryId)) { if (this->ws->hasClient(tryId)) {
if(clientId!=tryId){ if (clientId != tryId) {
this->ws->client(tryId)->text(text); this->ws->client(tryId)->text(text);
} }
count++; count++;
@ -454,14 +487,16 @@ void ESPUIClass::begin(const char *_title) {
server = new AsyncWebServer(80); server = new AsyncWebServer(80);
ws = new AsyncWebSocket("/ws"); ws = new AsyncWebSocket("/ws");
if(!SPIFFS.begin()) { if (!SPIFFS.begin()) {
Serial.println("SPIFFS Mount Failed, PLEASE CHECK THE README ON HOW TO PREPARE YOUR ESP!!!!!!!"); Serial.println("SPIFFS Mount Failed, PLEASE CHECK THE README ON HOW TO "
return; "PREPARE YOUR ESP!!!!!!!");
return;
} }
listDir("/", 1); listDir("/", 1);
if(!SPIFFS.exists( "/index.htm")) { if (!SPIFFS.exists("/index.htm")) {
Serial.println("Please read the README!!!!!!!, Make sure to ESPUI.prepareFileSystem() once in an empty sketch"); Serial.println("Please read the README!!!!!!!, Make sure to "
"ESPUI.prepareFileSystem() once in an empty sketch");
return; return;
} }
@ -475,9 +510,7 @@ void ESPUIClass::begin(const char *_title) {
}); });
server->onNotFound( server->onNotFound(
[](AsyncWebServerRequest *request) { [](AsyncWebServerRequest *request) { request->send(404); });
request->send(404);
});
server->begin(); server->begin();
if (debug) if (debug)