From cad14b3bc279d1918af214af6fa7a1837d432c98 Mon Sep 17 00:00:00 2001
From: Manuel Weiser <manuel.weiser@me.com>
Date: Sat, 22 Feb 2025 12:10:57 +0100
Subject: [PATCH] docs: update header title to 'Filament Management Tool' and
 improve update response messages

---
 html/header.html |  2 +-
 src/website.cpp  | 53 +++++++++++++++++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/html/header.html b/html/header.html
index 4b96795..7bf2e7e 100644
--- a/html/header.html
+++ b/html/header.html
@@ -24,7 +24,7 @@
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
                 <h1>FilaMan<span class="version"></span></h1>
-                <h4>Hollo Lollo Trollo</h4>
+                <h4>Filament Management Tool</h4>
             </div>
         </div>
         <nav style="display: flex; gap: 1rem;">
diff --git a/src/website.cpp b/src/website.cpp
index 256e05a..18d1b90 100644
--- a/src/website.cpp
+++ b/src/website.cpp
@@ -368,11 +368,11 @@ void setupWebserver(AsyncWebServer &server) {
         [](AsyncWebServerRequest *request) {
             // Nach Update-Abschluss
             bool success = !Update.hasError();
+            String message = success ? "Update successful" : String("Update failed: ") + Update.errorString();
             AsyncWebServerResponse *response = request->beginResponse(
                 success ? 200 : 400,
                 "application/json",
-                success ? "{\"success\":true,\"message\":\"Update successful\"}" 
-                       : "{\"success\":false,\"message\":\"Update failed\"}"
+                "{\"success\":" + String(success ? "true" : "false") + ",\"message\":\"" + message + "\"}"
             );
             response->addHeader("Connection", "close");
             request->send(response);
@@ -392,33 +392,46 @@ void setupWebserver(AsyncWebServer &server) {
 
             oledShowMessage("Upgrade please wait");
 
-            // TODO: Backup
-
             if (!index) {
                 updateSize = request->contentLength();
                 command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH;
+                Serial.printf("Update Start: %s\nSize: %u\nCommand: %d\n", filename.c_str(), updateSize, command);
                 
-                if (command == U_SPIFFS) {
-                    // Backup JSON config files before SPIFFS update
-                    backupJsonConfigs();
-                }
-                
-                // Setze spezifische Update-Flags für SPIFFS-Updates
-                if (!Update.begin(updateSize, command, command == U_SPIFFS ? true : false, command == U_SPIFFS ? 0 : -1)) {
-                    if (command == U_SPIFFS) {
-                        // Restore JSON config files if update fails at start
-                        restoreJsonConfigs();
-                    }
-                    String errorMsg = String("Update begin failed: ") + Update.errorString();
+                // Ü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) {
+                    Serial.println("Backup JSON configs...");
+                    backupJsonConfigs();
+                    
+                    if (!Update.begin(updateSize, command, false)) {
+                        Serial.printf("Update Begin Error: %s\n", Update.errorString());
+                        Serial.println("Restoring JSON configs...");
+                        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();
+                        request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
+                        return;
+                    }
+                }
             }
 
             if (len) {
                 if (Update.write(data, len) != len) {
+                    Serial.printf("Update Write Error: %s\n", Update.errorString());
                     if (command == U_SPIFFS) {
-                        // Restore JSON config files if update fails during write
+                        Serial.println("Restoring JSON configs...");
                         restoreJsonConfigs();
                     }
                     String errorMsg = String("Write failed: ") + Update.errorString();
@@ -426,21 +439,23 @@ void setupWebserver(AsyncWebServer &server) {
                     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) + "}";
                 request->send(200, "application/json", progress);
             }
 
             if (final) {
                 if (!Update.end(true)) {
+                    Serial.printf("Update End Error: %s\n", Update.errorString());
                     if (command == U_SPIFFS) {
-                        // Restore JSON config files if update fails at end
+                        Serial.println("Restoring JSON configs...");
                         restoreJsonConfigs();
                     }
                     String errorMsg = String("Update end failed: ") + Update.errorString();
                     request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
                     return;
                 }
+                Serial.println("Update Success!");
             }
         }
     );