andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

scheduler: change to std::string

Browse Source
This commit is contained in:
MichaelDvP
2024-08-02 08:20:10 +02:00
parent fb04bdf54c
commit 70e5b19223
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/web/WebSchedulerService.cpp
View File

@@ -336,29 +336,30 @@ bool WebSchedulerService::command(const char * name, const std::string & command
if (deserializeJson(doc, cmd) == DeserializationError::Ok) { if (deserializeJson(doc, cmd) == DeserializationError::Ok) {
HTTPClient http; HTTPClient http;
int httpResult = 0; int httpResult = 0;
String url = doc["url"] | ""; std::string url = doc["url"] | "";
// for a GET with parameters replace commands with values // for a GET with parameters replace commands with values
auto q = url.indexOf('?'); // don't search the complete url, it may contain a devicename in path
if (q != -1) { auto q = url.find_first_of('?');
auto s = url.substring(q + 1); if (q != std::string::npos) {
std::string v = s.c_str(); auto s = url.substr(q + 1); // copy only parameters
commands(v, false); auto l = s.length();
url.replace(s, v.c_str()); commands(s, false);
url.replace(q + 1, l, s);
} }
if (url.startsWith("http") && http.begin(url)) { if (!url.find("http") && http.begin(url.c_str())) {
// add any given headers // add any given headers
for (JsonPair p : doc["header"].as<JsonObject>()) { for (JsonPair p : doc["header"].as<JsonObject>()) {
http.addHeader(p.key().c_str(), p.value().as<String>().c_str()); http.addHeader(p.key().c_str(), p.value().as<String>().c_str());
} }
String value = doc["value"] | data.c_str(); // extract value if its in the command, or take the data std::string value = doc["value"] | data.c_str(); // extract value if its in the command, or take the data
String method = doc["method"] | "GET"; // default GET std::string method = doc["method"] | "GET"; // default GET
// if there is data, force a POST // if there is data, force a POST
if (value.length() || method == "post") { // we have all lowercase if (value.length() || method == "post") { // we have all lowercase
if (value.startsWith("{")) { if (value.find_first_of('{') != std::string::npos) {
http.addHeader("Content-Type", "application/json"); // auto-set to JSON http.addHeader("Content-Type", "application/json"); // auto-set to JSON
} }
httpResult = http.POST(value); httpResult = http.POST(value.c_str());
} else { } else {
httpResult = http.GET(); // normal GET httpResult = http.GET(); // normal GET
} }

16
src/web/shuntingYard.hpp
View File

@@ -613,28 +613,28 @@ std::string compute(const std::string & expr) {
JsonDocument doc; JsonDocument doc;
if (DeserializationError::Ok == deserializeJson(doc, cmd)) { if (DeserializationError::Ok == deserializeJson(doc, cmd)) {
HTTPClient http; HTTPClient http;
String url = doc["url"] | ""; std::string url = doc["url"] | "";
if (url.startsWith("http") && http.begin(url)) { if (!url.find("http") && http.begin(url.c_str())) {
int httpResult = 0; int httpResult = 0;
for (JsonPair p : doc["header"].as<JsonObject>()) { for (JsonPair p : doc["header"].as<JsonObject>()) {
http.addHeader(p.key().c_str(), p.value().as<std::string>().c_str()); http.addHeader(p.key().c_str(), p.value().as<std::string>().c_str());
} }
String value = doc["value"] | ""; std::string value = doc["value"] | "";
String method = doc["method"] | "GET"; // default GET std::string method = doc["method"] | "GET"; // default GET
// if there is data, force a POST // if there is data, force a POST
if (value.length() || method == "post") { if (value.length() || method == "post") {
if (value.startsWith("{")) { if (value.find_first_of('{') != std::string::npos) {
http.addHeader("Content-Type", "application/json"); // auto-set to JSON http.addHeader("Content-Type", "application/json"); // auto-set to JSON
} }
httpResult = http.POST(value); httpResult = http.POST(value.c_str());
} else { } else {
httpResult = http.GET(); // normal GET httpResult = http.GET(); // normal GET
} }
if (httpResult > 0) { if (httpResult > 0) {
std::string result = emsesp::Helpers::toLower(http.getString().c_str()); std::string result = emsesp::Helpers::toLower(http.getString().c_str());
String key = doc["key"] | ""; std::string key = doc["key"] | "";
doc.clear(); doc.clear();
if (key.length() && DeserializationError::Ok == deserializeJson(doc, result)) { if (key.length() && DeserializationError::Ok == deserializeJson(doc, result)) {
result = doc[key.c_str()].as<std::string>(); result = doc[key.c_str()].as<std::string>();
@@ -644,7 +644,7 @@ std::string compute(const std::string & expr) {
http.end(); http.end();
} }
} }
f = expr_new.find_first_of("{", e); f = expr_new.find_first_of('{', e);
} }
// positions: q-questionmark, c-colon // positions: q-questionmark, c-colon