Merge pull request #552 from MyMindWorld/main

Add custom QrCode saving
pr3y · Dec 13, 2024 · b35fbbe · b35fbbe
2 parents b78e54f + c8d574c
commit b35fbbe
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,4 @@ Bruce3_*.bin
 bruce.conf
 _*.sh
 tmp
-ISSUES.md
+ISSUES.md
diff --git a/src/core/config.cpp b/src/core/config.cpp
@@ -53,6 +53,13 @@ JsonDocument BruceConfig::toJson() const {
         dm.add(disabledMenus[i]);
     }
 
+    JsonArray qrArray = setting.createNestedArray("qrCodes");
+    for (const auto& entry : qrCodes) {
+        JsonObject qrEntry = qrArray.createNestedObject();
+        qrEntry["menuName"] = entry.menuName;
+        qrEntry["content"] = entry.content;
+    }
+
     return jsonDoc;
 }
 
@@ -136,6 +143,19 @@ void BruceConfig::fromFile() {
         }
     } else { count++; log_e("Fail"); }
 
+    if (!setting["qrCodes"].isNull()) {
+        qrCodes.clear();
+        JsonArray qrArray = setting["qrCodes"].as<JsonArray>();
+        for (JsonObject qrEntry : qrArray) {
+            String menuName = qrEntry["menuName"].as<String>();
+            String content = qrEntry["content"].as<String>();
+            qrCodes.push_back({menuName, content});
+            }
+    } else {
+        count++;
+        log_e("Fail to load qrCodes");
+    }
+
     validateConfig();
     if (count>0) saveFile();
 
@@ -421,3 +441,14 @@ void BruceConfig::addDisabledMenu(String value) {
     disabledMenus.push_back(value);
     saveFile();
 }
+
+void BruceConfig::addQrCodeEntry(const String& menuName, const String& content) {
+    qrCodes.push_back({menuName, content});
+    saveFile();
+}
+
+void BruceConfig::removeQrCodeEntry(const String& menuName) {
+    qrCodes.erase(std::remove_if(qrCodes.begin(), qrCodes.end(), 
+        [&](const QrCodeEntry& entry) { return entry.menuName == menuName; }), qrCodes.end());
+    saveFile();
+}
diff --git a/src/core/config.h b/src/core/config.h
@@ -31,6 +31,10 @@ class BruceConfig {
         String user;
         String pwd;
     };
+    struct QrCodeEntry {
+            String menuName;
+            String content;
+    };
 
     const char *filepath = "/bruce.conf";
 
@@ -70,6 +74,13 @@ class BruceConfig {
 
     std::vector<String> disabledMenus = {};
 
+    std::vector<QrCodeEntry> qrCodes = {
+            {"Bruce AP", "WIFI:T:WPA;S:BruceNet;P:brucenet;;"},
+            {"Bruce Wiki", "https://github.com/pr3y/Bruce/wiki"}, 
+            {"Bruce Site", "https://bruce.computer"},
+            {"Rickroll", "https://youtu.be/dQw4w9WgXcQ"}
+    };
+
     /////////////////////////////////////////////////////////////////////////////////////
     // Constructor
     /////////////////////////////////////////////////////////////////////////////////////
@@ -103,6 +114,8 @@ class BruceConfig {
     void setWebUICreds(const String& usr, const String& pwd);
     void setWifiApCreds(const String& ssid, const String& pwd);
     void addWifiCredential(const String& ssid, const String& pwd);
+    void addQrCodeEntry(const String& menuName, const String& content);
+    void removeQrCodeEntry(const String& menuName);
     String getWifiPassword(const String& ssid) const;
 
     void setIrTxPin(int value);

diff --git a/src/modules/others/qrcode_menu.cpp b/src/modules/others/qrcode_menu.cpp
@@ -2,6 +2,8 @@
 #include "core/display.h"
 #include "core/settings.h"
 #include "core/mykeyboard.h"
+#include "qrcode_menu.h"
+#include "core/config.h"
 
 
 uint16_t crc_ccitt_update(uint16_t crc, uint8_t data) {
@@ -42,8 +44,8 @@ void qrcode_display(String qrcodeUrl) {
 #endif
 }
 
-void custom_qrcode() {
-    String message = keyboard("", 100, "QRCode text:");
+void display_custom_qrcode() {
+    String message = keyboard("", 100, "QRCode text:");    
     return qrcode_display(message);
 }
 
@@ -63,19 +65,84 @@ void pix_qrcode() {
 }
 
 void qrcode_menu() {
+
+    std::vector<Option> options;
+
+    // Add QR codes from the config
+    for (const auto& entry : bruceConfig.qrCodes) {
+        options.emplace_back(std::string(entry.menuName.c_str()), [=]() { qrcode_display(entry.content); });
+    }
+
+    options.emplace_back("PIX", [=]() { pix_qrcode(); });
+    options.emplace_back("Custom", [=]() { custom_qrcode_menu(); });
+    options.emplace_back("Main menu", [=]() { backToMenu(); });
+
+    delay(200);
+    loopOptions(options);
+    delay(200);
+}
+
+void custom_qrcode_menu() {
     options = {
-        {"Bruce AP",    [=]() { qrcode_display("WIFI:T:WPA;S:BruceNet;P:brucenet;;"); }},
-        {"Bruce Repo",  [=]() { qrcode_display("https://github.com/pr3y/Bruce"); }},
-        {"Rickroll",    [=]() { qrcode_display("https://youtu.be/dQw4w9WgXcQ"); }},
-        {"HackerTyper", [=]() { qrcode_display("https://hackertyper.net/"); }},
-        {"ZomboCom",    [=]() { qrcode_display("https://html5zombo.com/"); }},
-        {"PIX",         [=]() { pix_qrcode(); }},
-        {"Custom",      [=]() { custom_qrcode(); }},
-        {"Main menu",   [=]() { backToMenu(); }},
+        {"Display",      [=]() { display_custom_qrcode(); }},
+        {"Save&Display", [=]() { save_and_display_qrcode(); }},
+        {"Remove",       [=]() { remove_custom_qrcode(); }},
+        {"Back",         [=]() { qrcode_menu(); }}
     };
-
     delay(200);
     loopOptions(options);
     delay(200);
 }
 
+void save_and_display_qrcode() {
+
+    String name = keyboard("", 100, "QRCode name:");
+    if (name.isEmpty()){
+        displayError("Name cannot be empty!");
+        delay(1000);
+        return;
+    }
+
+    if (std::any_of(bruceConfig.qrCodes.begin(), bruceConfig.qrCodes.end(),
+                    [&](const BruceConfig::QrCodeEntry &entry)
+                    {
+                        return entry.menuName == name;
+                    }))
+    {
+        displayError("Name already exists!");
+        delay(1000);
+        return;
+    }
+
+    String text = keyboard("", 100, "QRCode text:");
+
+    bruceConfig.addQrCodeEntry(name, text);
+    return qrcode_display(text);
+}
+
+void remove_custom_qrcode() {
+    if (bruceConfig.qrCodes.empty()){
+        displayInfo("There is nothing to remove!");
+        delay(1000);
+        custom_qrcode_menu();
+    }
+    std::vector<Option> options;
+
+    // Populate options with the QR codes from the config
+    for (const auto& entry : bruceConfig.qrCodes) {
+        options.emplace_back(
+            std::string(entry.menuName.c_str()), 
+            [=]() { 
+                bruceConfig.removeQrCodeEntry(entry.menuName); 
+                log_i("Removed QR code: %s", entry.menuName.c_str());
+                custom_qrcode_menu(); 
+            }
+        );
+    }
+
+    options.emplace_back("Back", [=]() { custom_qrcode_menu(); });
+
+    delay(200);
+    loopOptions(options);
+    delay(200);
+}  
diff --git a/src/modules/others/qrcode_menu.h b/src/modules/others/qrcode_menu.h
@@ -1,4 +1,12 @@
+#ifndef QR_CODE_MENU_H
+#define QR_CODE_MENU_H
+
 void qrcode_display(String qrcodeUrl);
-void custom_qrcode();
 void pix_qrcode();
 void qrcode_menu();
+void custom_qrcode_menu();
+void display_custom_qrcode();
+void save_and_display_qrcode();
+void remove_custom_qrcode();
+
+#endif