mpflash 0.7.2__tar.gz → 0.7.3__tar.gz

{mpflash-0.7.2 → mpflash-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mpflash
-Version: 0.7.2
+Version: 0.7.3
 Summary: Flash and download tool for MicroPython firmwares
 Home-page: https://github.com/Josverl/micropython-stubber/blob/main/src/mpflash/README.md
 License: MIT

{mpflash-0.7.2 → mpflash-0.7.3}/mpflash/list.py

@@ -51,23 +51,44 @@ def show_mcus(
     conn_mcus: List[MPRemoteBoard],
     title: str = "Connected boards",
     refresh: bool = True,
-):  # sourcery skip: extract-duplicate-method
+):
+    console.print(mcu_table(conn_mcus, title, refresh))
+
+
+def abbrv_family(family: str, is_narrow: bool) -> str:
+    ABRV = {"micropython": "upy", "circuitpython": "cpy"}
+    if is_narrow:
+        if family in ABRV:
+            return ABRV[family]
+        return family[:4]
+    return family
+
+
+def mcu_table(
+    conn_mcus: List[MPRemoteBoard],
+    title: str = "Connected boards",
+    refresh: bool = True,
+):
     """Show the list of connected boards in a nice table"""
     table = Table(
         title=title,
         title_style="magenta",
         header_style="bold magenta",
         collapse_padding=True,
-        width=110,
+        padding=(0, 0),
+        # width=80,
     )
-    table.add_column("Serial", overflow="fold")
-    table.add_column("Family")
+    needs_build = any(mcu.build for mcu in conn_mcus)
+    is_narrow = console.width < 100
+    table.add_column("Ser." if is_narrow else "Serial", overflow="fold")
+    table.add_column("Fam." if is_narrow else "Family", overflow="crop", max_width=4 if is_narrow else None)
     table.add_column("Port")
     table.add_column("Board", overflow="fold")
     # table.add_column("Variant") # TODO: add variant
     table.add_column("CPU")
-    table.add_column("Version")
-    table.add_column("build", justify="right")
+    table.add_column("Version", overflow="fold", max_width=8 if is_narrow else None)
+    if needs_build:
+        table.add_column("Bld" if is_narrow else "Build", justify="right")
 
     for mcu in track(conn_mcus, description="Updating board info", transient=True, update_period=0.1):
         if refresh:
@@ -76,14 +97,17 @@ def show_mcus(
             except ConnectionError:
                 continue
         description = f"[italic bright_cyan]{mcu.description}" if mcu.description else ""
-        table.add_row(
+        row = [
             mcu.serialport.replace("/dev/", ""),
-            mcu.family,
+            abbrv_family(mcu.family, is_narrow),
             mcu.port,
             f"{mcu.board}\n{description}".strip(),
             # mcu.variant,
             mcu.cpu,
             clean_version(mcu.version),
-            mcu.build,
-        )
-    console.print(table)
+        ]
+        if needs_build:
+            row.append(mcu.build)
+
+        table.add_row(*row)
+    return table

{mpflash-0.7.2 → mpflash-0.7.3}/mpflash/mpboard_id/board_id.py

@@ -15,12 +15,12 @@ HERE = Path(__file__).parent
 ###############################################################################################
 
 
-def find_board_id(
+def find_board_id_by_description(
     descr: str, short_descr: str, board_info: Optional[Path] = None, version: str = "stable"
 ) -> Optional[str]:
     """Find the MicroPython BOARD_ID based on the description in the firmware"""
     try:
-        boards = find_board_id_by_description(
+        boards = _find_board_id_by_description(
             descr=descr,
             short_descr=short_descr,
             board_info=board_info,
@@ -32,7 +32,9 @@ def find_board_id(
 
 
 @functools.lru_cache(maxsize=20)
-def find_board_id_by_description(*, descr: str, short_descr: str, version="v1.21.0", board_info: Optional[Path] = None):
+def _find_board_id_by_description(
+    *, descr: str, short_descr: str, version="v1.21.0", board_info: Optional[Path] = None
+):
     """
     Find the MicroPython BOARD_ID based on the description in the firmware
     using the pre-built board_info.json file

{mpflash-0.7.2 → mpflash-0.7.3}/mpflash/mpremoteboard/__init__.py

@@ -13,7 +13,7 @@ from rich.progress import track
 from tenacity import retry, stop_after_attempt, wait_fixed
 
 from mpflash.errors import MPFlashError
-from mpflash.mpboard_id.board_id import find_board_id
+from mpflash.mpboard_id.board_id import find_board_id_by_description
 from mpflash.mpremoteboard.runner import run
 
 ###############################################################################################
@@ -116,7 +116,7 @@ class MPRemoteBoard:
             self.description = descr = info["board"]
             pos = descr.rfind(" with")
             short_descr = descr[:pos].strip() if pos != -1 else ""
-            if board_name := find_board_id(descr, short_descr):
+            if board_name := find_board_id_by_description(descr, short_descr):
                 self.board = board_name
             else:
                 self.board = "UNKNOWN"

{mpflash-0.7.2 → mpflash-0.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mpflash"
-version = "0.7.2"
+version = "0.7.3"
 description = "Flash and download tool for MicroPython firmwares"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"
@@ -50,6 +50,7 @@ pytest-mock = "^3.10.0"
 mock = "^4.0.3"
 distro = "^1.8.0"
 fasteners = "^0.19"
+jsons = "^1.6.3"
 
 
 [build-system]