github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-06 19:06:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract _ram_line and a nil-safe _dict_get

Browse Source 
The RAM block's inline isinstance ternaries collapse, and the summary
body reads as two symmetric line helpers.
This commit is contained in:
J. Nick Koston
2026-08-23 15:36:42 -05:00
parent aa200c1051
commit 1fa8d37558
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/espidf/size_summary.py
+20 -17
View File
@@ -112,21 +112,26 @@ def _print_summary(size_json: Path, partitions_csv: Path | None) -> None:
_LOGGER.warning("Skipping size summary: unexpected shape in %s", size_json) _LOGGER.warning("Skipping size summary: unexpected shape in %s", size_json)
return return
if (ram := _ram_line(data, size_json)) is not None:
print(ram)
if (flash := _flash_line(data, partitions_csv)) is not None:
print(flash)
def _dict_get(mapping: object, key: str) -> object:
"""dict.get that reads None from any non-dict."""
return mapping.get(key) if isinstance(mapping, dict) else None
def _ram_line(data: dict, size_json: Path) -> str | None:
"""The formatted RAM line, or None (already logged) to skip it."""
memory_types = data.get("memory_types") memory_types = data.get("memory_types")
ram_region = ( ram_region = _dict_get(memory_types, "DRAM") or _dict_get(memory_types, "DIRAM")
memory_types.get("DRAM") or memory_types.get("DIRAM") used = _dict_get(ram_region, "used")
if isinstance(memory_types, dict) total = _dict_get(ram_region, "size")
else None if isinstance(used, (int, float)) and isinstance(total, (int, float)) and total > 0:
) return f"RAM: {_format_bar(int(used), int(total))}"
ram_used = ram_region.get("used") if isinstance(ram_region, dict) else None if (memory_types is not None and not isinstance(memory_types, dict)) or (
ram_total = ram_region.get("size") if isinstance(ram_region, dict) else None
if (
isinstance(ram_used, (int, float))
and isinstance(ram_total, (int, float))
and ram_total > 0
):
print(f"RAM: {_format_bar(int(ram_used), int(ram_total))}")
elif (memory_types is not None and not isinstance(memory_types, dict)) or (
ram_region is not None and not isinstance(ram_region, dict) ram_region is not None and not isinstance(ram_region, dict)
): ):
# A structurally corrupt report, not a variant without the region # A structurally corrupt report, not a variant without the region
@@ -135,9 +140,7 @@ def _print_summary(size_json: Path, partitions_csv: Path | None) -> None:
_LOGGER.warning( _LOGGER.warning(
"Skipping RAM summary: no usable DRAM/DIRAM region in %s", size_json "Skipping RAM summary: no usable DRAM/DIRAM region in %s", size_json
) )
return None
if (flash := _flash_line(data, partitions_csv)) is not None:
print(flash)
def _flash_line(data: dict, partitions_csv: Path | None) -> str | None: def _flash_line(data: dict, partitions_csv: Path | None) -> str | None: