jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-09 11:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
J. Nick Koston 2025-06-29 19:49:01 -05:00
parent 939144174c
commit 1927f92358
No known key found for this signature in database
2 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
esphome/components/web_server_idf/multipart_reader.cpp
View File

@ -53,50 +53,41 @@ size_t MultipartReader::parse(const char *data, size_t len) {
return parsed; return parsed;
} }
void MultipartReader::process_header_() { void MultipartReader::process_header_(const std::string &value) {
// Process the completed header (field + value pair)
if (str_startswith_case_insensitive(current_header_field_, "content-disposition")) { if (str_startswith_case_insensitive(current_header_field_, "content-disposition")) {
// Parse name and filename from Content-Disposition // Parse name and filename from Content-Disposition
current_part_.name = extract_header_param(current_header_value_, "name"); current_part_.name = extract_header_param(value, "name");
current_part_.filename = extract_header_param(current_header_value_, "filename"); current_part_.filename = extract_header_param(value, "filename");
} else if (str_startswith_case_insensitive(current_header_field_, "content-type")) { } else if (str_startswith_case_insensitive(current_header_field_, "content-type")) {
current_part_.content_type = str_trim(current_header_value_); current_part_.content_type = str_trim(value);
} }
// Clear field for next header
current_header_field_.clear();
} }
int MultipartReader::on_header_field(multipart_parser *parser, const char *at, size_t length) { int MultipartReader::on_header_field(multipart_parser *parser, const char *at, size_t length) {
MultipartReader *reader = static_cast<MultipartReader *>(multipart_parser_get_data(parser)); MultipartReader *reader = static_cast<MultipartReader *>(multipart_parser_get_data(parser));
// If we were processing a value, save it // Store the header field name
if (!reader->current_header_value_.empty()) {
reader->process_header_();
reader->current_header_value_.clear();
}
// Start new header field
reader->current_header_field_.assign(at, length); reader->current_header_field_.assign(at, length);
reader->in_headers_ = true;
return 0; return 0;
} }
int MultipartReader::on_header_value(multipart_parser *parser, const char *at, size_t length) { int MultipartReader::on_header_value(multipart_parser *parser, const char *at, size_t length) {
MultipartReader *reader = static_cast<MultipartReader *>(multipart_parser_get_data(parser)); MultipartReader *reader = static_cast<MultipartReader *>(multipart_parser_get_data(parser));
reader->current_header_value_.append(at, length);
// Process the header immediately with the value
std::string value(at, length);
reader->process_header_(value);
return 0; return 0;
} }
int MultipartReader::on_headers_complete(multipart_parser *parser) { int MultipartReader::on_headers_complete(multipart_parser *parser) {
MultipartReader *reader = static_cast<MultipartReader *>(multipart_parser_get_data(parser)); MultipartReader *reader = static_cast<MultipartReader *>(multipart_parser_get_data(parser));
// Process last header if any
if (!reader->current_header_value_.empty()) {
reader->process_header_();
}
reader->in_headers_ = false;
reader->current_header_field_.clear();
reader->current_header_value_.clear();
ESP_LOGV(TAG, "Part headers complete: name='%s', filename='%s', content_type='%s'", ESP_LOGV(TAG, "Part headers complete: name='%s', filename='%s', content_type='%s'",
reader->current_part_.name.c_str(), reader->current_part_.filename.c_str(), reader->current_part_.name.c_str(), reader->current_part_.filename.c_str(),
reader->current_part_.content_type.c_str()); reader->current_part_.content_type.c_str());

5
esphome/components/web_server_idf/multipart_reader.h
View File

@ -56,14 +56,11 @@ class MultipartReader {
Part current_part_; Part current_part_;
std::string current_header_field_; std::string current_header_field_;
std::string current_header_value_;
DataCallback data_callback_; DataCallback data_callback_;
PartCompleteCallback part_complete_callback_; PartCompleteCallback part_complete_callback_;
bool in_headers_{false}; void process_header_(const std::string &value);
void process_header_();
}; };
} // namespace web_server_idf } // namespace web_server_idf