espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/asyncio_progress_term_width' into 'master'

Browse Source 
tools: fix progress output in asyncio.run with zero terminal width

Closes IDF-6646

See merge request espressif/esp-idf!22986
This commit is contained in:
Roland Dobai
2023-04-06 15:23:39 +08:00
parent 7d4835e817 84deb34035
commit 05a8d0b58a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/idf_py_actions/tools.py
View File

@@ -179,6 +179,8 @@ def fit_text_in_terminal(out: str) -> str:
"""Fit text in terminal, if the string is not fit replace center with `...`""" """Fit text in terminal, if the string is not fit replace center with `...`"""
space_for_dots = 3 # Space for "..." space_for_dots = 3 # Space for "..."
terminal_width, _ = os.get_terminal_size() terminal_width, _ = os.get_terminal_size()
if not terminal_width:
return out
if terminal_width <= space_for_dots: if terminal_width <= space_for_dots:
# if the wide of the terminal is too small just print dots # if the wide of the terminal is too small just print dots
return '.' * terminal_width return '.' * terminal_width
@@ -273,9 +275,8 @@ class RunTool:
def print_progression(output: str) -> None: def print_progression(output: str) -> None:
# Print a new line on top of the previous line # Print a new line on top of the previous line
sys.stdout.write('\x1b[K') print('\r' + fit_text_in_terminal(output.strip('\n\r')) + '\x1b[K', end='', file=output_stream)
print('\r', end='') output_stream.flush()
print(fit_text_in_terminal(output.strip('\n\r')), end='', file=output_stream)
async def read_stream() -> Optional[str]: async def read_stream() -> Optional[str]:
try: try: