3D-Druck/Filaman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 110 Wiki Activity

docs: update header title to 'Filament Management Tool' and improve update response messages

Browse Source
This commit is contained in:
Manuel Weiser 2025-02-22 12:10:57 +01:00
parent 312f75fc5f
commit cad14b3bc2
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/header.html
View File

@ -24,7 +24,7 @@
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version"></span></h1> <h1>FilaMan<span class="version"></span></h1>
<h4>Hollo Lollo Trollo</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>
<nav style="display: flex; gap: 1rem;"> <nav style="display: flex; gap: 1rem;">

41
src/website.cpp
View File

@ -368,11 +368,11 @@ void setupWebserver(AsyncWebServer &server) {
[](AsyncWebServerRequest *request) { [](AsyncWebServerRequest *request) {
// Nach Update-Abschluss // Nach Update-Abschluss
bool success = !Update.hasError(); bool success = !Update.hasError();
String message = success ? "Update successful" : String("Update failed: ") + Update.errorString();
AsyncWebServerResponse *response = request->beginResponse( AsyncWebServerResponse *response = request->beginResponse(
success ? 200 : 400, success ? 200 : 400,
"application/json", "application/json",
success ? "{\"success\":true,\"message\":\"Update successful\"}" "{\"success\":" + String(success ? "true" : "false") + ",\"message\":\"" + message + "\"}"
: "{\"success\":false,\"message\":\"Update failed\"}"
); );
response->addHeader("Connection", "close"); response->addHeader("Connection", "close");
request->send(response); request->send(response);
@ -392,33 +392,46 @@ void setupWebserver(AsyncWebServer &server) {
oledShowMessage("Upgrade please wait"); oledShowMessage("Upgrade please wait");
// TODO: Backup
if (!index) { if (!index) {
updateSize = request->contentLength(); updateSize = request->contentLength();
command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH; command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH;
Serial.printf("Update Start: %s\nSize: %u\nCommand: %d\n", filename.c_str(), updateSize, command);
// Überprüfe die SPIFFS-Größe
if (command == U_SPIFFS && updateSize > 0x30000) {
String errorMsg = "SPIFFS update too large. Maximum size is 192KB";
Serial.println(errorMsg);
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
return;
}
if (command == U_SPIFFS) { if (command == U_SPIFFS) {
// Backup JSON config files before SPIFFS update Serial.println("Backup JSON configs...");
backupJsonConfigs(); backupJsonConfigs();
}
// Setze spezifische Update-Flags für SPIFFS-Updates if (!Update.begin(updateSize, command, false)) {
if (!Update.begin(updateSize, command, command == U_SPIFFS ? true : false, command == U_SPIFFS ? 0 : -1)) { Serial.printf("Update Begin Error: %s\n", Update.errorString());
if (command == U_SPIFFS) { Serial.println("Restoring JSON configs...");
// Restore JSON config files if update fails at start
restoreJsonConfigs(); restoreJsonConfigs();
String errorMsg = String("Update begin failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
return;
} }
} else {
if (!Update.begin(updateSize, command)) {
Serial.printf("Update Begin Error: %s\n", Update.errorString());
String errorMsg = String("Update begin failed: ") + Update.errorString(); String errorMsg = String("Update begin failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
return; return;
} }
} }
}
if (len) { if (len) {
if (Update.write(data, len) != len) { if (Update.write(data, len) != len) {
Serial.printf("Update Write Error: %s\n", Update.errorString());
if (command == U_SPIFFS) { if (command == U_SPIFFS) {
// Restore JSON config files if update fails during write Serial.println("Restoring JSON configs...");
restoreJsonConfigs(); restoreJsonConfigs();
} }
String errorMsg = String("Write failed: ") + Update.errorString(); String errorMsg = String("Write failed: ") + Update.errorString();
@ -426,21 +439,23 @@ void setupWebserver(AsyncWebServer &server) {
return; return;
} }
// Sende den Fortschritt als JSON, um unerwünschte Zeilenumbrüche zu vermeiden Serial.printf("Progress: %u/%u\n", index + len, updateSize);
String progress = "{\"progress\":" + String((index + len) * 100 / updateSize) + "}"; String progress = "{\"progress\":" + String((index + len) * 100 / updateSize) + "}";
request->send(200, "application/json", progress); request->send(200, "application/json", progress);
} }
if (final) { if (final) {
if (!Update.end(true)) { if (!Update.end(true)) {
Serial.printf("Update End Error: %s\n", Update.errorString());
if (command == U_SPIFFS) { if (command == U_SPIFFS) {
// Restore JSON config files if update fails at end Serial.println("Restoring JSON configs...");
restoreJsonConfigs(); restoreJsonConfigs();
} }
String errorMsg = String("Update end failed: ") + Update.errorString(); String errorMsg = String("Update end failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
return; return;
} }
Serial.println("Update Success!");
} }
} }
); );