From 8c11241af03010d967dbaaf9e4774352035bee73 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 20 Jul 2025 20:08:57 -1000 Subject: [PATCH] cleanup --- script/api_protobuf/api_protobuf.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py index 0cfa7fc344..96471d33b2 100755 --- a/script/api_protobuf/api_protobuf.py +++ b/script/api_protobuf/api_protobuf.py @@ -657,20 +657,23 @@ class BytesType(TypeInfo): return f"buffer.encode_bytes({self.number}, this->{self.field_name}_ptr_, this->{self.field_name}_len_);" def dump(self, name: str) -> str: + ptr_dump = f"format_hex_pretty(this->{self.field_name}_ptr_, this->{self.field_name}_len_)" + str_dump = f"format_hex_pretty(reinterpret_cast(this->{self.field_name}.data()), this->{self.field_name}.size())" + # For SOURCE_CLIENT only, always use std::string if not self.needs_encode: - return f"out.append(format_hex_pretty(reinterpret_cast(this->{self.field_name}.data()), this->{self.field_name}.size()));" + return f"out.append({str_dump});" # For SOURCE_SERVER, always use pointer/length if not self.needs_decode: - return f"out.append(format_hex_pretty(this->{self.field_name}_ptr_, this->{self.field_name}_len_));" + return f"out.append({ptr_dump});" # For SOURCE_BOTH, check if pointer is set (sending) or use string (received) return ( f"if (this->{self.field_name}_ptr_ != nullptr) {{\n" - f" out.append(format_hex_pretty(this->{self.field_name}_ptr_, this->{self.field_name}_len_));\n" + f" out.append({ptr_dump});\n" f" }} else {{\n" - f" out.append(format_hex_pretty(reinterpret_cast(this->{self.field_name}.data()), this->{self.field_name}.size()));\n" + f" out.append({str_dump});\n" f" }}" )