circfirm 2.0.0__py3-none-any.whl → 2.0.1__py3-none-any.whl

circfirm/cli.py

@@ -34,9 +34,15 @@ def cli() -> None:
 @click.option("-b", "--board", default=None, help="Assume the given board name")
 def install(version: str, language: str, board: Optional[str]) -> None:
     """Install the specified version of CircuitPython."""
+    circuitpy = circfirm.backend.find_circuitpy()
+    bootloader = circfirm.backend.find_bootloader()
+    if not circuitpy and not bootloader:
+        click.echo("CircuitPython device not found!")
+        click.echo("Check that the device is connected and mounted.")
+        sys.exit(1)
+
     if not board:
-        circuitpy = circfirm.backend.find_circuitpy()
-        if not circuitpy and circfirm.backend.find_bootloader():
+        if not circuitpy and bootloader:
             click.echo("CircuitPython device found, but it is in bootloader mode!")
             click.echo(
                 "Please put the device out of bootloader mode, or use the --board option."
@@ -45,20 +51,14 @@ def install(version: str, language: str, board: Optional[str]) -> None:
         board = circfirm.backend.get_board_name(circuitpy)
 
         click.echo("Board name detected, please switch the device to bootloader mode.")
-        while not circfirm.backend.find_bootloader():
+        while not (bootloader := circfirm.backend.find_bootloader()):
             time.sleep(1)
 
-    mount_path = circfirm.backend.find_bootloader()
-    if not mount_path:
-        circuitpy = circfirm.backend.find_circuitpy()
-        if circuitpy:
+    if not bootloader:
+        if circfirm.backend.find_circuitpy():
             click.echo("CircuitPython device found, but is not in bootloader mode!")
             click.echo("Please put the device in bootloader mode.")
             sys.exit(2)
-        else:
-            click.echo("CircuitPython device not found!")
-            click.echo("Check that the device is connected and mounted.")
-            sys.exit(1)
 
     if not circfirm.backend.is_downloaded(board, version, language):
         click.echo("Downloading UF2...")
@@ -66,7 +66,7 @@ def install(version: str, language: str, board: Optional[str]) -> None:
 
     uf2file = circfirm.backend.get_uf2_filepath(board, version, language)
     uf2filename = os.path.basename(uf2file)
-    shutil.copyfile(uf2file, os.path.join(mount_path, uf2filename))
+    shutil.copyfile(uf2file, os.path.join(bootloader, uf2filename))
     click.echo("UF2 file copied to device!")
     click.echo("Device should reboot momentarily.")
 

{circfirm-2.0.0.dist-info → circfirm-2.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: circfirm
-Version: 2.0.0
+Version: 2.0.1
 Summary: CLI tool for install firmware for CircuitPython boards
 Author-email: Alec Delaney <tekktrik@gmail.com>
 License: MIT

circfirm-2.0.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+circfirm/__init__.py,sha256=c5spgXArUydQ9xwHyO-32mJS61okL3IgRXYUG1JFRO4,459
+circfirm/backend.py,sha256=75fNPs4aURHEMxh0BdWVPrRYLJaMy1IZVhebM70jDEA,5589
+circfirm/cli.py,sha256=7UJKLKnuiR_o1FQmJ3dq-U1rcJtXuXCQvNXB2aKTjns,5148
+circfirm/startup.py,sha256=n3OI01SoOhvV-qzGbKis6YUaOiC5eV6zZ2MHfHgG59k,1514
+circfirm-2.0.1.dist-info/LICENSE,sha256=6pPP6gJ00tqCkxg5gABHDwWUiXZ_mBzH94xxPOqwGj4,1069
+circfirm-2.0.1.dist-info/METADATA,sha256=mKa7MbJ6SkeE-wBno4WTgKYDwYMHb7nZLVCQ7flsL88,3775
+circfirm-2.0.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+circfirm-2.0.1.dist-info/entry_points.txt,sha256=33qZTmSuXz8dgi29yjSyb8VsEA8HyhWuhn2MNcjatGQ,46
+circfirm-2.0.1.dist-info/top_level.txt,sha256=qA2407wap3My6jGA5uchH2JjUM7qn73oBPwALN7GR5k,9
+circfirm-2.0.1.dist-info/RECORD,,

circfirm-2.0.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-circfirm/__init__.py,sha256=c5spgXArUydQ9xwHyO-32mJS61okL3IgRXYUG1JFRO4,459
-circfirm/backend.py,sha256=75fNPs4aURHEMxh0BdWVPrRYLJaMy1IZVhebM70jDEA,5589
-circfirm/cli.py,sha256=8N-7mS4PmNPpjjtT0FALh2LNmXJguBiYmFwGZ42k9Bc,5174
-circfirm/startup.py,sha256=n3OI01SoOhvV-qzGbKis6YUaOiC5eV6zZ2MHfHgG59k,1514
-circfirm-2.0.0.dist-info/LICENSE,sha256=6pPP6gJ00tqCkxg5gABHDwWUiXZ_mBzH94xxPOqwGj4,1069
-circfirm-2.0.0.dist-info/METADATA,sha256=PN1HB8zr2DAG_ciN2jrhWYyIGwg5JYhxdvaChuNkXJE,3775
-circfirm-2.0.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-circfirm-2.0.0.dist-info/entry_points.txt,sha256=33qZTmSuXz8dgi29yjSyb8VsEA8HyhWuhn2MNcjatGQ,46
-circfirm-2.0.0.dist-info/top_level.txt,sha256=qA2407wap3My6jGA5uchH2JjUM7qn73oBPwALN7GR5k,9
-circfirm-2.0.0.dist-info/RECORD,,