From 5a1a600327c816210f96d83583dec4fb4ec277bc Mon Sep 17 00:00:00 2001 From: lumapu Date: Thu, 23 Mar 2023 22:41:56 +0100 Subject: [PATCH] 0.5.105 * merged MI, thx @rejoe2 #788 * fixed reboot message #793 --- src/CHANGES.md | 4 ++++ src/defines.h | 2 +- src/web/RestApi.h | 8 ++++++++ src/web/html/convert.py | 5 ++++- src/web/web.h | 6 +++--- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/CHANGES.md b/src/CHANGES.md index 0af4746b..4223ad99 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -2,6 +2,10 @@ (starting from release version `0.5.66`) +## 0.5.105 +* merged MI, thx @rejoe2 #788 +* fixed reboot message #793 + ## 0.5.104 * further improved save settings * removed `#` character from ePaper diff --git a/src/defines.h b/src/defines.h index f29f6ea5..dafcb9ec 100644 --- a/src/defines.h +++ b/src/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 5 -#define VERSION_PATCH 104 +#define VERSION_PATCH 105 //------------------------------------- typedef struct { diff --git a/src/web/RestApi.h b/src/web/RestApi.h index 01c1726e..15402e7a 100644 --- a/src/web/RestApi.h +++ b/src/web/RestApi.h @@ -79,6 +79,7 @@ class RestApi { String path = request->url().substring(5); if(path == "html/system") getHtmlSystem(root); else if(path == "html/logout") getHtmlLogout(root); + else if(path == "html/reboot") getHtmlReboot(root); else if(path == "html/save") getHtmlSave(root); else if(path == "system") getSysInfo(root); else if(path == "generic") getGeneric(root); @@ -264,6 +265,13 @@ class RestApi { obj[F("html")] = F("succesfully logged out"); } + void getHtmlReboot(JsonObject obj) { + getGeneric(obj.createNestedObject(F("generic"))); + obj[F("refresh")] = 20; + obj[F("refresh_url")] = "/"; + obj[F("html")] = F("rebooting ..."); + } + void getHtmlSave(JsonObject obj) { getGeneric(obj.createNestedObject(F("generic"))); obj["pending"] = (bool)mApp->getSavePending(); diff --git a/src/web/html/convert.py b/src/web/html/convert.py index 8b67d701..00f398ac 100644 --- a/src/web/html/convert.py +++ b/src/web/html/convert.py @@ -9,7 +9,10 @@ import subprocess def get_git_sha(): - return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('ascii').strip() + try: + return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('ascii').strip() + except: + return "0000000" def readVersion(path): f = open(path, "r") diff --git a/src/web/web.h b/src/web/web.h index 91818b96..46e5ccb7 100644 --- a/src/web/web.h +++ b/src/web/web.h @@ -327,7 +327,7 @@ class Web { mProtected = true; - AsyncWebServerResponse *response = request->beginResponse_P(200, F("text/html; charset=UTF-8"), save_html, save_html_len); + AsyncWebServerResponse *response = request->beginResponse_P(200, F("text/html; charset=UTF-8"), system_html, system_html_len); response->addHeader(F("Content-Encoding"), "gzip"); request->send(response); } @@ -375,7 +375,7 @@ class Web { void onReboot(AsyncWebServerRequest *request) { mApp->setRebootFlag(); - AsyncWebServerResponse *response = request->beginResponse_P(200, F("text/html; charset=UTF-8"), save_html, save_html_len); + AsyncWebServerResponse *response = request->beginResponse_P(200, F("text/html; charset=UTF-8"), system_html, system_html_len); response->addHeader(F("Content-Encoding"), "gzip"); request->send(response); } @@ -593,7 +593,7 @@ class Web { mApp->saveSettings((request->arg("reboot") == "on")); - AsyncWebServerResponse *response = request->beginResponse_P(200, F("text/html; charset=UTF-8"), save_html, save_html_len); + AsyncWebServerResponse *response = request->beginResponse_P(200, F("text/html; charset=UTF-8"), system_html, save_html_len); response->addHeader(F("Content-Encoding"), "gzip"); request->send(response); }