settings: explicit prefix check

xoseperez · Apr 11, 2024 · 3646e4f · 3646e4f
1 parent 256f64f
commit 3646e4f
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 42 deletions.
diff --git a/code/espurna/api_common.cpp b/code/espurna/api_common.cpp
@@ -68,7 +68,7 @@ namespace web {
 STRING_VIEW_INLINE(Prefix, "api");
 
 bool onKeyCheck(espurna::StringView key, const JsonVariant&) {
-    return espurna::settings::query::samePrefix(key, Prefix);
+    return key.startsWith(Prefix);
 }
 
 void onVisible(JsonObject& root) {

diff --git a/code/espurna/button.cpp b/code/espurna/button.cpp
@@ -830,7 +830,7 @@ static constexpr espurna::settings::query::IndexedSetting IndexedSettings[] PROG
 };
 
 bool checkSamePrefix(StringView key) {
-    return espurna::settings::query::samePrefix(key, espurna::button::settings::Prefix);
+    return key.startsWith(espurna::button::settings::Prefix);
 }
 
 String findValueFrom(StringView key) {

diff --git a/code/espurna/curtain_kingart.cpp b/code/espurna/curtain_kingart.cpp
@@ -388,7 +388,7 @@ void _curtainWebSocketOnConnected(JsonObject& root) {
 
 //------------------------------------------------------------------------------
 bool _curtainWebSocketOnKeyCheck(espurna::StringView key, const JsonVariant& value) {
-    return espurna::settings::query::samePrefix(key, CurtainPrefix);
+    return key.startsWith(CurtainPrefix);
 }
 
 //------------------------------------------------------------------------------

diff --git a/code/espurna/domoticz.cpp b/code/espurna/domoticz.cpp
@@ -437,7 +437,7 @@ namespace {
 STRING_VIEW_INLINE(Prefix, "dcz");
 
 bool onKeyCheck(espurna::StringView key, const JsonVariant&) {
-    return espurna::settings::query::samePrefix(key, Prefix);
+    return key.startsWith(Prefix);
 }
 
 void onVisible(JsonObject& root) {

diff --git a/code/espurna/garland.cpp b/code/espurna/garland.cpp
@@ -228,9 +228,9 @@ void _garlandWebSocketOnConnected(JsonObject& root) {
 
 //------------------------------------------------------------------------------
 bool _garlandWebSocketOnKeyCheck(espurna::StringView key, const JsonVariant&) {
-    return espurna::settings::query::samePrefix(key, NAME_GARLAND_ENABLED)
-        || espurna::settings::query::samePrefix(key, NAME_GARLAND_BRIGHTNESS)
-        || espurna::settings::query::samePrefix(key, NAME_GARLAND_SPEED);
+    return key.equals(NAME_GARLAND_ENABLED)
+        || key.equals(NAME_GARLAND_BRIGHTNESS)
+        || key.equals(NAME_GARLAND_SPEED);
 }
 
 //------------------------------------------------------------------------------

diff --git a/code/espurna/homeassistant.cpp b/code/espurna/homeassistant.cpp
@@ -122,7 +122,7 @@ static constexpr espurna::settings::query::Setting Settings[] PROGMEM {
 STRING_VIEW_INLINE(Prefix, "ha");
 
 bool checkSamePrefix(espurna::StringView key) {
-    return espurna::settings::query::samePrefix(key, Prefix);
+    return key.startsWith(Prefix);
 }
 
 String findValueFrom(espurna::StringView key) {

diff --git a/code/espurna/influxdb.cpp b/code/espurna/influxdb.cpp
@@ -135,7 +135,7 @@ void _idbInitClient() {
 STRING_VIEW_INLINE(IdbPrefix, "idb");
 
 bool _idbWebSocketOnKeyCheck(espurna::StringView key, const JsonVariant& value) {
-    return espurna::settings::query::samePrefix(key, IdbPrefix);
+    return key.startsWith(IdbPrefix);
 }
 
 void _idbWebSocketOnVisible(JsonObject& root) {

diff --git a/code/espurna/led.cpp b/code/espurna/led.cpp
@@ -631,7 +631,7 @@ static constexpr espurna::settings::query::IndexedSetting IndexedSettings[] PROG
 };
 
 bool checkSamePrefix(StringView key) {
-    return espurna::settings::query::samePrefix(key, Prefix);
+    return key.startsWith(Prefix);
 }
 
 String findValueFrom(StringView key) {

diff --git a/code/espurna/mqtt.cpp b/code/espurna/mqtt.cpp
@@ -407,7 +407,7 @@ static constexpr espurna::settings::query::Setting Settings[] PROGMEM {
 };
 
 bool checkSamePrefix(espurna::StringView key) {
-    return espurna::settings::query::samePrefix(key, settings::Prefix);
+    return key.startsWith(settings::Prefix);
 }
 
 String findValueFrom(espurna::StringView key) {

diff --git a/code/espurna/nofuss.cpp b/code/espurna/nofuss.cpp
@@ -31,7 +31,7 @@ bool _nofussEnabled = false;
 STRING_VIEW_INLINE(NofussPrefix, "nofuss");
 
 bool _nofussWebSocketOnKeyCheck(espurna::StringView key, const JsonVariant& value) {
-    return espurna::settings::query::samePrefix(key, NofussPrefix);
+    return key.startsWith(NofussPrefix);
 }
 
 void _nofussWebSocketOnVisible(JsonObject& root) {

diff --git a/code/espurna/ntp.cpp b/code/espurna/ntp.cpp
@@ -382,7 +382,7 @@ time_t now() {
 namespace web {
 
 bool onKeyCheck(StringView key, const JsonVariant&) {
-    return espurna::settings::query::samePrefix(key, settings::Prefix);
+    return key.startsWith(settings::Prefix);
 }
 
 void onVisible(JsonObject& root) {

diff --git a/code/espurna/relay.cpp b/code/espurna/relay.cpp
@@ -2334,7 +2334,7 @@ STRING_VIEW_INLINE(RelayPrefix, "relay");
 STRING_VIEW_INLINE(MultiRelay, "multirelay");
 
 bool _relayWebSocketOnKeyCheck(espurna::StringView key, const JsonVariant&) {
-    return espurna::settings::query::samePrefix(key, RelayPrefix);
+    return key.startsWith(RelayPrefix);
 }
 
 void _relayWebSocketUpdate(JsonObject& root) {
@@ -3318,7 +3318,7 @@ namespace {
 
 bool checkSamePrefix(StringView key) {
     PROGMEM_STRING(Prefix, "relay");
-    return espurna::settings::query::samePrefix(key, Prefix);
+    return key.startsWith(Prefix);
 }
 
 String findIndexedValueFrom(StringView key) {

diff --git a/code/espurna/rfbridge.cpp b/code/espurna/rfbridge.cpp
@@ -462,7 +462,7 @@ void _rfbWebSocketOnAction(uint32_t client_id, const char* action, JsonObject& d
 }
 
 bool _rfbWebSocketOnKeyCheck(espurna::StringView key, const JsonVariant& value) {
-    return espurna::settings::query::samePrefix(key, rfbridge::settings::Prefix);
+    return key.startsWith(rfbridge::settings::Prefix);
 }
 
 #endif // WEB_SUPPORT

diff --git a/code/espurna/rfm69.cpp b/code/espurna/rfm69.cpp
@@ -244,7 +244,7 @@ void _rfm69WebSocketOnConnected(JsonObject& root) {
 }
 
 bool _rfm69WebSocketOnKeyCheck(espurna::StringView key, const JsonVariant& value) {
-    return espurna::settings::query::samePrefix(key, Rfm69Prefix);
+    return key.startsWith(Rfm69Prefix);
 }
 
 void _rfm69WebSocketOnAction(uint32_t client_id, const char* action, JsonObject& data) {

diff --git a/code/espurna/rpnrules.cpp b/code/espurna/rpnrules.cpp
@@ -394,7 +394,7 @@ size_t countMqttNames() {
 #endif
 
 bool onKeyCheck(espurna::StringView key, const JsonVariant& value) {
-    return espurna::settings::query::samePrefix(key, settings::Prefix);
+    return key.startsWith(settings::Prefix);
 }
 
 void onVisible(JsonObject& root) {

diff --git a/code/espurna/scheduler.cpp b/code/espurna/scheduler.cpp
@@ -417,7 +417,7 @@ void migrate(int version) {
 namespace query {
 
 bool checkSamePrefix(StringView key) {
-    return espurna::settings::query::samePrefix(key, Prefix);
+    return key.startsWith(Prefix);
 }
 
 String findIndexedValueFrom(StringView key) {
@@ -576,7 +576,7 @@ void setup() {
 namespace web {
 
 bool onKey(StringView key, const JsonVariant&) {
-    return espurna::settings::query::samePrefix(key, settings::Prefix);
+    return key.startsWith(settings::Prefix);
 }
 
 void onVisible(JsonObject& root) {

diff --git a/code/espurna/sensor.cpp b/code/espurna/sensor.cpp
@@ -3140,18 +3140,18 @@ bool check(StringView key) {
         return false;
     }
 
-    using espurna::settings::query::samePrefix;
-    if (samePrefix(key, settings::prefix::Sensor)) {
+    if (key.startsWith(settings::prefix::Sensor)) {
         return true;
     }
 
-    if (samePrefix(key, settings::prefix::Power)) {
+    if (key.startsWith(settings::prefix::Power)) {
         return true;
     }
 
-    return magnitude::forEachCountedCheck([&](unsigned char type) {
-        return samePrefix(key, prefix::get(type));
-    });
+    return magnitude::forEachCountedCheck(
+        [&](unsigned char type) {
+            return key.startsWith(prefix::get(type));
+        });
 }
 
 String get(StringView key) {

diff --git a/code/espurna/settings.cpp b/code/espurna/settings.cpp
@@ -64,7 +64,7 @@ String Setting::findValueFrom(const Setting* begin, const Setting* end, StringVi
 
 bool IndexedSetting::findSamePrefix(const IndexedSetting* begin, const IndexedSetting* end, StringView key) {
     for (auto it = begin; it != end; ++it) {
-        if (samePrefix(key, (*it).prefix())) {
+        if (key.startsWith((*it).prefix())) {
             return true;
         }
     }
@@ -180,7 +180,7 @@ void foreach_prefix(PrefixResultCallback&& callback, query::StringViewIterator p
     kv_store.foreach([&](kvs_type::KeyValueResult&& kv) {
         auto key = kv.key.read();
         for (auto it = prefixes.begin(); it != prefixes.end(); ++it) {
-            if (query::samePrefix(StringView{key}, (*it))) {
+            if (StringView{key}.startsWith(*it)) {
                 callback((*it), std::move(key), kv.value);
             }
         }

diff --git a/code/espurna/settings_helpers.h b/code/espurna/settings_helpers.h
@@ -292,10 +292,6 @@ struct alignas(8) Enumeration {
 
 namespace query {
 
-inline bool samePrefix(StringView key, StringView prefix) {
-    return key.startsWith(prefix);
-}
-
 struct StringViewIterator {
     using Element = const StringView*;
 

diff --git a/code/espurna/telnet.cpp b/code/espurna/telnet.cpp
@@ -127,7 +127,7 @@ static constexpr std::array<espurna::settings::query::Setting, 3> Settings PROGM
 }};
 
 bool checkExactPrefix(StringView key) {
-    return espurna::settings::query::samePrefix(key, settings::Prefix);
+    return key.startsWith(settings::Prefix);
 }
 
 String findValueFrom(StringView key) {

diff --git a/code/espurna/thingspeak.cpp b/code/espurna/thingspeak.cpp
@@ -682,7 +682,7 @@ namespace {
 STRING_VIEW_INLINE(Prefix, "tspk");
 
 bool onKeyCheck(StringView key, const JsonVariant&) {
-    return espurna::settings::query::samePrefix(key, Prefix);
+    return key.startsWith(Prefix);
 }
 
 void onVisible(JsonObject& root) {

diff --git a/code/espurna/uart.cpp b/code/espurna/uart.cpp
@@ -425,6 +425,9 @@ size_t ports() {
 }
 
 namespace settings {
+
+STRING_VIEW_INLINE(Prefix, "uart");
+
 namespace query {
 
 #define ID_VALUE(NAME)\
@@ -454,8 +457,7 @@ static constexpr espurna::settings::query::IndexedSetting IndexedSettings[] PROG
 };
 
 bool checkSamePrefix(StringView key) {
-    PROGMEM_STRING(Prefix, "uart");
-    return espurna::settings::query::samePrefix(key, Prefix);
+    return key.startsWith(Prefix);
 }
 
 String findIndexedValueFrom(StringView key) {

diff --git a/code/espurna/wifi.cpp b/code/espurna/wifi.cpp
@@ -2242,6 +2242,9 @@ void configure() {
 // -----------------------------------------------------------------------------
 
 namespace settings {
+
+STRING_VIEW_INLINE(Prefix, "wifi");
+
 namespace query {
 
 static constexpr std::array<espurna::settings::query::Setting, 11> Settings PROGMEM {
@@ -2267,12 +2270,7 @@ bool checkIndexedPrefix(StringView key) {
 
 // generic 'ap' and 'modem' configuration
 bool checkExactPrefix(StringView key) {
-    PROGMEM_STRING(Prefix, "wifi");
-    if (espurna::settings::query::samePrefix(key, Prefix)) {
-        return true;
-    }
-
-    return false;
+    return key.startsWith(Prefix);
 }
 
 String findIndexedValueFrom(StringView key) {