From b7c090465bd3a3cbc4cfbefb91050963ffc7ae2e Mon Sep 17 00:00:00 2001
From: Yurii <laxilef@gmail.com>
Date: Fri, 12 Jan 2024 21:06:32 +0300
Subject: [PATCH] refactor: moving some strings to flash memory

---
 lib/WebServerHandlers/UpgradeHandler.h | 14 +++++++-------
 src/strings.h                          |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/WebServerHandlers/UpgradeHandler.h b/lib/WebServerHandlers/UpgradeHandler.h
index 37e0dc0..5b9d536 100644
--- a/lib/WebServerHandlers/UpgradeHandler.h
+++ b/lib/WebServerHandlers/UpgradeHandler.h
@@ -154,11 +154,11 @@ public:
         result->error = Update.errorString();
         #endif
 
-        Log.serrorln("PORTAL.OTA", F("File '%s', on start: %s"), upload.filename.c_str(), result->error.c_str());
+        Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s', on start: %s"), upload.filename.c_str(), result->error.c_str());
         return;
       }
       
-      Log.sinfoln("PORTAL.OTA", F("File '%s', started"), upload.filename.c_str());
+      Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s', started"), upload.filename.c_str());
 
     } else if (upload.status == UPLOAD_FILE_WRITE) {
       if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
@@ -172,20 +172,20 @@ public:
         #endif
 
         Log.serrorln(
-          "PORTAL.OTA",
+          FPSTR(L_PORTAL_OTA),
           F("File '%s', on writing %d bytes: %s"),
           upload.filename.c_str(), upload.totalSize, result->error
         );
 
       } else {
-        Log.sinfoln("PORTAL.OTA", F("File '%s', writed %d bytes"), upload.filename.c_str(), upload.totalSize);
+        Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s', writed %d bytes"), upload.filename.c_str(), upload.totalSize);
       }
 
     } else if (upload.status == UPLOAD_FILE_END) {
       if (Update.end(true)) {
         result->status = UpgradeStatus::SUCCESS;
 
-        Log.sinfoln("PORTAL.OTA", F("File '%s': finish"), upload.filename.c_str());
+        Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s': finish"), upload.filename.c_str());
 
       } else {
         result->status = UpgradeStatus::ERROR_ON_FINISH;
@@ -195,14 +195,14 @@ public:
         result->error = Update.errorString();
         #endif
 
-        Log.serrorln("PORTAL.OTA", F("File '%s', on finish: %s"), upload.filename.c_str(), result->error);
+        Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s', on finish: %s"), upload.filename.c_str(), result->error);
       }
 
     } else if (upload.status == UPLOAD_FILE_ABORTED) {
       Update.end(false);
       result->status = UpgradeStatus::ABORTED;
 
-      Log.serrorln("PORTAL.OTA", F("File '%s': aborted"), upload.filename.c_str());
+      Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s': aborted"), upload.filename.c_str());
     }
   }
 
diff --git a/src/strings.h b/src/strings.h
index 254b3d9..2278050 100644
--- a/src/strings.h
+++ b/src/strings.h
@@ -9,6 +9,7 @@ const char L_NETWORK_SETTINGS[]     PROGMEM = "NETWORK.SETTINGS";
 const char L_PORTAL_WEBSERVER[]     PROGMEM = "PORTAL.WEBSERVER";
 const char L_PORTAL_DNSSERVER[]     PROGMEM = "PORTAL.DNSSERVER";
 const char L_PORTAL_CAPTIVE[]       PROGMEM = "PORTAL.CAPTIVE";
+const char L_PORTAL_OTA[]           PROGMEM = "PORTAL.OTA";
 const char L_MAIN[]                 PROGMEM = "MAIN";
 const char L_MQTT[]                 PROGMEM = "MQTT";
 const char L_MQTT_MSG[]             PROGMEM = "MQTT.MSG";