From 23fd29c5b24ca02c23a2e61c2b2ff45bdd400625 Mon Sep 17 00:00:00 2001 From: Filip Date: Tue, 11 Aug 2026 22:49:16 +0200 Subject: [PATCH] fix: charmap error --- smpmgr/common.py | 10 ++++++++-- smpmgr/main.py | 8 +++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/smpmgr/common.py b/smpmgr/common.py index 67541c3..d80e47f 100644 --- a/smpmgr/common.py +++ b/smpmgr/common.py @@ -2,10 +2,12 @@ import asyncio import logging +import sys from dataclasses import dataclass, fields from typing import Final, Type, TypedDict, TypeVar, assert_never import typer +from rich.console import Console from rich.progress import Progress, SpinnerColumn, TextColumn from serial import SerialException from smp.exceptions import SMPBadStartDelimiter @@ -128,7 +130,9 @@ def get_smpclient(options: Options) -> SMPClient: async def connect_with_spinner(smpclient: SMPClient) -> None: """Spin while connecting to the SMP Server; raises `typer.Exit` if connection fails.""" with Progress( - SpinnerColumn(), TextColumn("[progress.description]{task.description}") + SpinnerColumn(spinner_name="line"), + TextColumn("[progress.description]{task.description}"), + console=Console(force_terminal=sys.stdout.isatty()), ) as progress: connect_task_description = f"Connecting to {smpclient._address}..." connect_task = progress.add_task(description=connect_task_description, total=None) @@ -156,7 +160,9 @@ async def smp_request( timeout_s: float | None = None, ) -> TRep | TEr1 | TEr2: with Progress( - SpinnerColumn(), TextColumn("[progress.description]{task.description}") + SpinnerColumn(spinner_name="line"), + TextColumn("[progress.description]{task.description}"), + console=Console(force_terminal=sys.stdout.isatty()), ) as progress: description = description or f"Waiting for response to {request.__class__.__name__}..." task = progress.add_task(description=description, total=None) diff --git a/smpmgr/main.py b/smpmgr/main.py index ac6c455..0b8e00a 100644 --- a/smpmgr/main.py +++ b/smpmgr/main.py @@ -265,9 +265,11 @@ async def f() -> None: image_states_response = await smp_request( smpclient, ImageStatesWrite(hash=image_hash, confirm=confirm), - "Marking uploaded image for permanent upgrade..." - if confirm - else "Marking uploaded image for test upgrade...", + ( + "Marking uploaded image for permanent upgrade..." + if confirm + else "Marking uploaded image for test upgrade..." + ), ) if success(image_states_response): pass