Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-06-02 03:02:19 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

[http_request] Replace std::map with std::vector in action template (#14026)

Browse Source
This commit is contained in:
J. Nick Koston
2026-02-18 21:32:24 -06:00
committed by GitHub
parent dff9780d3a
commit e7f2021864
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/http_request/__init__.py
+5 -1
View File
@@ -302,10 +302,14 @@ async def http_request_action_to_code(config, action_id, template_arg, args):
lambda_ = await cg.process_lambda(json_, args_, return_type=cg.void) lambda_ = await cg.process_lambda(json_, args_, return_type=cg.void)
cg.add(var.set_json(lambda_)) cg.add(var.set_json(lambda_))
else: else:
cg.add(var.init_json(len(json_)))
for key in json_: for key in json_:
template_ = await cg.templatable(json_[key], args, cg.std_string) template_ = await cg.templatable(json_[key], args, cg.std_string)
cg.add(var.add_json(key, template_)) cg.add(var.add_json(key, template_))
for key, value in config.get(CONF_REQUEST_HEADERS, {}).items(): request_headers = config.get(CONF_REQUEST_HEADERS, {})
if request_headers:
cg.add(var.init_request_headers(len(request_headers)))
for key, value in request_headers.items():
template_ = await cg.templatable(value, args, cg.const_char_ptr) template_ = await cg.templatable(value, args, cg.const_char_ptr)
cg.add(var.add_request_header(key, template_)) cg.add(var.add_request_header(key, template_))
esphome/components/http_request/http_request.h
+6 -5
View File
@@ -1,7 +1,6 @@
#pragma once #pragma once
#include <list> #include <list>
#include <map>
#include <memory> #include <memory>
#include <set> #include <set>
#include <utility> #include <utility>
@@ -399,13 +398,15 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
TEMPLATABLE_VALUE(bool, capture_response) TEMPLATABLE_VALUE(bool, capture_response)
#endif #endif
void init_request_headers(size_t count) { this->request_headers_.init(count); }
void add_request_header(const char *key, TemplatableValue<const char *, Ts...> value) { void add_request_header(const char *key, TemplatableValue<const char *, Ts...> value) {
this->request_headers_.insert({key, value}); this->request_headers_.push_back({key, value});
} }
void add_collect_header(const char *value) { this->lower_case_collect_headers_.push_back(value); } void add_collect_header(const char *value) { this->lower_case_collect_headers_.push_back(value); }
void add_json(const char *key, TemplatableValue<std::string, Ts...> value) { this->json_.insert({key, value}); } void init_json(size_t count) { this->json_.init(count); }
void add_json(const char *key, TemplatableValue<std::string, Ts...> value) { this->json_.push_back({key, value}); }
void set_json(std::function<void(Ts..., JsonObject)> json_func) { this->json_func_ = json_func; } void set_json(std::function<void(Ts..., JsonObject)> json_func) { this->json_func_ = json_func; }
@@ -507,9 +508,9 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
} }
void encode_json_func_(Ts... x, JsonObject root) { this->json_func_(x..., root); } void encode_json_func_(Ts... x, JsonObject root) { this->json_func_(x..., root); }
HttpRequestComponent *parent_; HttpRequestComponent *parent_;
std::map<const char *, TemplatableValue<const char *, Ts...>> request_headers_{}; FixedVector<std::pair<const char *, TemplatableValue<const char *, Ts...>>> request_headers_{};
std::vector<std::string> lower_case_collect_headers_{"content-type", "content-length"}; std::vector<std::string> lower_case_collect_headers_{"content-type", "content-length"};
std::map<const char *, TemplatableValue<std::string, Ts...>> json_{}; FixedVector<std::pair<const char *, TemplatableValue<std::string, Ts...>>> json_{};
std::function<void(Ts..., JsonObject)> json_func_{nullptr}; std::function<void(Ts..., JsonObject)> json_func_{nullptr};
#ifdef USE_HTTP_REQUEST_RESPONSE #ifdef USE_HTTP_REQUEST_RESPONSE
Trigger<std::shared_ptr<HttpContainer>, std::string &, Ts...> success_trigger_with_response_; Trigger<std::shared_ptr<HttpContainer>, std::string &, Ts...> success_trigger_with_response_;