mpflash 1.25.0rc1__py3-none-any.whl → 1.25.0rc2__py3-none-any.whl

mpflash/cli_list.py

@@ -1,4 +1,5 @@
 import json
+import time
 from typing import List
 
 import rich_click as click
@@ -82,5 +83,9 @@ def cli_list_mcus(serial: List[str], ignore: List[str], bluetooth: bool, as_json
         show_mcus(conn_mcus, refresh=False)
     for mcu in conn_mcus:
         # reset the board so it can continue to whatever it was running before
-        mcu.run_command("reset")
+        if mcu.family == "circuitpython":
+            # CircuitPython boards need a special reset command
+            mcu.run_command(["exec", "--no-follow", "import microcontroller,time;time.sleep(0.01);microcontroller.reset()"], resume=False)
+        else:
+            mcu.run_command("reset")
     return 0 if conn_mcus else 1

mpflash/db/core.py

@@ -6,6 +6,7 @@ from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
 from mpflash.config import config
+from mpflash.errors import MPFlashError
 
 # TODO:  lazy import to avoid slowdowns ?
 from .models import Base
@@ -24,11 +25,15 @@ def migrate_database(boards: bool = True, firmwares: bool = True):
     # get the location of the database from the session
     with Session() as session:
         db_location = session.get_bind().url.database # type: ignore
-        log.debug(f"Database location: {Path(db_location)}") # type: ignore
-
-    create_database()
+        log.debug(f"Database location: {Path(db_location)}")  # type: ignore
+
+    try:
+        create_database()
+    except (DatabaseError, OperationalError) as e:
+        log.error(f"Error creating database: {e}")
+        log.error("Database might already exist, trying to migrate.")
+        raise MPFlashError("Database migration failed. Please check the logs for more details.") from e
     if boards:
-
         update_boards()
     if firmwares:
         jsonl_file = config.firmware_folder / "firmware.jsonl"

mpflash/db/loader.py

@@ -76,6 +76,8 @@ def load_jsonl_to_db(jsonl_path: Path):
                 if "preview" in record:
                     record["version"] = f"{record['version']}-preview" if record["preview"] else record["version"]
                     record.pop("preview", None)  # Remove 'preview' column
+                if not "custom" in record:
+                    record["custom"] = False
                 firmware_file = str(Path(record["filename"]).as_posix()) if record["filename"] else ""
 
                 # Check if Firmware with this firmware_file exists

{mpflash-1.25.0rc1.dist-info → mpflash-1.25.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mpflash
-Version: 1.25.0rc1
+Version: 1.25.0rc2
 Summary: Flash and download tool for MicroPython firmwares
 License: MIT
 Keywords: MicroPython,firmware,flash,download,UF2,esptool

{mpflash-1.25.0rc1.dist-info → mpflash-1.25.0rc2.dist-info}/RECORD

@@ -11,15 +11,15 @@ mpflash/bootloader/touch1200.py,sha256=VND7_YniS9Vx6WEaAxjI72RZZ6WBOwmBTsKJkbuaA
 mpflash/cli_download.py,sha256=sMMIVTE4P9O2GpWB9jcbOiKQX-XJ0nu2bBylRbWu0X8,3872
 mpflash/cli_flash.py,sha256=K2TEyQndibtKdwSkeeu_esDUsu8H0_4DB_37SF7DR9E,7657
 mpflash/cli_group.py,sha256=Uf_1ZmeeSIsaGLuuKn3KPPPVi8fJVbIacJYFZx_oPHc,2684
-mpflash/cli_list.py,sha256=XwX0j9JzFzm2o-_oEWLR07QaMMAUrS1a553_-IpCdj0,2352
+mpflash/cli_list.py,sha256=ZuRalXXjDGo6FhgMTv54BQD_PNss7eeopeZQ_uE1J90,2632
 mpflash/cli_main.py,sha256=NMhEtMtSe7ApE-210Q4p-g7ZgewgO-4z1Q-vNKLQ47Y,1277
 mpflash/common.py,sha256=fEFxSy2KVAhBUlJv0GsWnUHdJtRckp2XGlYVPAhS8WE,5924
 mpflash/config.py,sha256=bmwNSJzk27iHcI-r3C6hm6-TeOat2ymzbbv-Q-xuO2o,3048
 mpflash/connected.py,sha256=oxZdk1o-AfNPhJsSxr3KrMH_gdYfrjqc_IpT6J8Ng9k,3496
 mpflash/db/__init__.py,sha256=wnIlO4nOXsPGXMbn2OCqHRsR-hUmtJsko8VdqjH3ZUE,45
-mpflash/db/core.py,sha256=2t6pE385d8WgVrG7Kp2jmGdVZ5n0FiK6mHWAWOqZXW4,1949
+mpflash/db/core.py,sha256=hyzurZp8QMl8Q9B00Q-tOkOUp68T8XhM7tj3dm5cDHw,2283
 mpflash/db/gather_boards.py,sha256=8QS7NIt3n9ROqtgVAnoqU8YMeObLGaN2pvJL7d_kULA,3905
-mpflash/db/loader.py,sha256=RUbcnJ51r6bDq61vdglAlvYZzIaoLLGtTtm3FrSFrTQ,4758
+mpflash/db/loader.py,sha256=0L4I3ySaGLFlzy9FlV7_nzbqzA6MHwi0FhgDG5FJ_9U,4848
 mpflash/db/meta.py,sha256=I7JycEx37MVVYowA0VFfUYFX9IURiTTsWQ1RhFgGqes,2251
 mpflash/db/micropython_boards.zip,sha256=cc4m7VSskj__rhabw3j5OZCiz1yEi6yCx7JGFn1QB0k,16647
 mpflash/db/models.py,sha256=Q4yjZPcNRIGWevoACeGDS1i31QX6jq1q5TsyPjmdmz4,3448
@@ -62,8 +62,8 @@ mpflash/vendor/pico-universal-flash-nuke/universal_flash_nuke.uf2,sha256=QuPMppq
 mpflash/vendor/pydfu.py,sha256=1I8dwbacUH_-u2y6gYZYRKO_Iof8Eb3rZsVyQ1ETluI,20364
 mpflash/vendor/readme.md,sha256=BQ7Uxf8joeYMjTUuSLLBG49ob6a9MgFPIEwuc72-Mfw,415
 mpflash/versions.py,sha256=HuujLNdMKY_mQXyEqwXVHcU8nbuXeBiWP2TMA5JQhr4,4884
-mpflash-1.25.0rc1.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
-mpflash-1.25.0rc1.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
-mpflash-1.25.0rc1.dist-info/METADATA,sha256=L7CGVRIBkloWrj0gm30DxyXLAtFUPE425HzvyjenePU,23938
-mpflash-1.25.0rc1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-mpflash-1.25.0rc1.dist-info/RECORD,,
+mpflash-1.25.0rc2.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
+mpflash-1.25.0rc2.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
+mpflash-1.25.0rc2.dist-info/METADATA,sha256=yw6z-qe0GA3gXJJJHyVBp58Wqah9knQLX_vDUNTm1Y8,23938
+mpflash-1.25.0rc2.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+mpflash-1.25.0rc2.dist-info/RECORD,,