flashpod 0.2.2__tar.gz → 0.2.4__tar.gz

{flashpod-0.2.2 → flashpod-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flashpod
-Version: 0.2.2
+Version: 0.2.4
 Summary: Command-line iPod sync + card-flashing tooling for early FireWire-era iPods, pure Python
 Author: David Barnhart
 License-Expression: MIT

{flashpod-0.2.2 → flashpod-0.2.4}/flashpod/ipod_flash.py

@@ -397,10 +397,53 @@ def device_mountpoints(dev):
 # ----------------------------------------------------------------------------
 # Interactive selection + confirmation
 # ----------------------------------------------------------------------------
-def choose_device():
-    cands = list_candidates()
-    if not cands:
-        sys.exit(color("No removable/USB disks found. Plug in the card and retry.", C_RED))
+def pick_device(scan, render, path_of, empty_msg):
+    """Interactive device chooser shared by every platform backend.
+
+    ``scan()`` returns the candidate list (called again on each refresh),
+    ``render(items)`` prints the table, ``path_of(item)`` yields the device path
+    to return — or ``None`` for an entry that exists but can't be written, such
+    as the empty slot of a multi-slot card reader. Rejecting it here is much
+    kinder than letting it through: with no media, every downstream call fails
+    obscurely ("could not determine size", access denied) and reads as a bug.
+
+    The loop accepts 'r' to re-scan. Without it, a reader plugged in — or a card
+    inserted — after the list was drawn stays invisible until you quit and start
+    the whole command over, which is a long way back when you've already picked
+    a model and firmware.
+    """
+    items = scan()
+    if not items:
+        sys.exit(color(empty_msg, C_RED))
+    render(items)
+    while True:
+        try:
+            sel = input(color("Select device number "
+                              "('r' to rescan, 'q' to quit): ", C_CYN)).strip().lower()
+        except (EOFError, KeyboardInterrupt):
+            print(file=sys.stderr)
+            sys.exit("Aborted.")
+        if sel in ("q", "quit", ""):
+            sys.exit("Aborted.")
+        if sel in ("r", "refresh", "rescan"):
+            items = scan()
+            if not items:
+                print(color("  " + empty_msg, C_YEL), file=sys.stderr)
+            else:
+                render(items)
+            continue
+        if sel.isdigit() and int(sel) < len(items):
+            path = path_of(items[int(sel)])
+            if path:
+                return path
+            print(color("  that slot is empty — insert a card and press 'r' "
+                        "to rescan, or pick another device", C_YEL),
+                  file=sys.stderr)
+            continue
+        print(color("  invalid selection", C_RED), file=sys.stderr)
+
+
+def _render_candidates(cands):
     print(color("\nAttached removable storage:\n", C_CYN), file=sys.stderr)
     # Multi-slot readers expose one /dev/sdX per slot, all with the same
     # identity strings; number the slots so they can be told apart.
@@ -442,13 +485,13 @@ def choose_device():
         if r["warn"]:
             print(color(" " * sub + "⚠ " + r["warn"], C_YEL), file=sys.stderr)
     print(file=sys.stderr)
-    while True:
-        sel = input(color("Select device number (or 'q' to quit): ", C_CYN)).strip()
-        if sel.lower() in ("q", "quit", ""):
-            sys.exit("Aborted.")
-        if sel.isdigit() and int(sel) < len(cands):
-            return "/dev/" + cands[int(sel)]["name"]
-        print(color("  invalid selection", C_RED), file=sys.stderr)
+
+
+def choose_device():
+    return pick_device(
+        list_candidates, _render_candidates,
+        lambda d: ("/dev/" + d["name"]) if int(d.get("size") or 0) else None,
+        "No removable/USB disks found. Plug in the card and retry.")
 
 def device_label(dev):
     """Short, typeable name for a device, used in the ERASE confirmation.
@@ -761,7 +804,9 @@ def flash(device=None, firmware=None,
 
     total_sectors = plat.device_sectors(dev)
     if total_sectors <= 0:
-        sys.exit(color("could not determine size of %s" % dev, C_RED))
+        sys.exit(color("could not determine size of %s — is a card inserted? "
+                       "An empty slot in a multi-slot reader still appears as "
+                       "a disk, but reports size 0." % dev, C_RED))
     confirm(dev, total_sectors, assume_yes or dry_run, lba48, max_data_sectors)
     plat.unmount_all(dev, dry_run)
     write_layout(dev, fw, total_sectors, dry_run, do_format, lba48, max_data_sectors)

{flashpod-0.2.2 → flashpod-0.2.4}/flashpod/platform/macos.py

@@ -73,26 +73,26 @@ class MacOSPlatform(Platform):
     def choose_device(self):
         from .. import ipod_flash
         color = ipod_flash.color
-        disks = self._external_disks()
-        if not disks:
-            sys.exit(color("No external disks found. Plug in the card reader and retry.",
-                           ipod_flash.C_RED))
-        print(color("\nAttached external disks:\n", ipod_flash.C_CYN), file=sys.stderr)
-        for i, (d, info) in enumerate(disks):
+
+        def render(disks):
+            print(color("\nAttached external disks:\n", ipod_flash.C_CYN),
+                  file=sys.stderr)
+            for i, (d, info) in enumerate(disks):
+                size = int(info.get("TotalSize") or info.get("Size") or 0)
+                name = (info.get("MediaName") or info.get("IORegistryEntryName")
+                        or "").strip() or "disk"
+                print("  [%d] /dev/%-7s  %10s  %s" %
+                      (i, d, ipod_flash.fmt_size(size), name), file=sys.stderr)
+            print(file=sys.stderr)
+
+        def to_path(item):
+            d, info = item
             size = int(info.get("TotalSize") or info.get("Size") or 0)
-            name = (info.get("MediaName") or info.get("IORegistryEntryName")
-                    or "").strip() or "disk"
-            print("  [%d] /dev/%-7s  %10s  %s" %
-                  (i, d, ipod_flash.fmt_size(size), name), file=sys.stderr)
-        print(file=sys.stderr)
-        while True:
-            sel = input(color("Select device number (or 'q' to quit): ",
-                              ipod_flash.C_CYN)).strip()
-            if sel.lower() in ("q", "quit", ""):
-                sys.exit("Aborted.")
-            if sel.isdigit() and int(sel) < len(disks):
-                return "/dev/" + disks[int(sel)][0]
-            print(color("  invalid selection", ipod_flash.C_RED), file=sys.stderr)
+            return ("/dev/" + d) if size else None   # 0 = empty reader slot
+
+        return ipod_flash.pick_device(
+            self._external_disks, render, to_path,
+            "No external disks found. Plug in the card reader and retry.")
 
     def device_sectors(self, dev):
         # real file/image -> just its size

{flashpod-0.2.2 → flashpod-0.2.4}/flashpod/platform/windows.py

@@ -144,29 +144,42 @@ class WindowsPlatform(Platform):
                           f[4].strip().lower() == "true" or f[5].strip().lower() == "true"))
         return disks
 
+    def _removable_disks(self):
+        """Removable/USB disks worth offering, falling back to every non-system
+        disk when nothing matches the removable bus types."""
+        disks = self._disks()
+        cands = [d for d in disks
+                 if not d[4] and d[3] in ("USB", "SD", "MMC", "1394")]
+        return cands or [d for d in disks if not d[4]]
+
     def choose_device(self):
         from .. import ipod_flash
         color = ipod_flash.color
-        cands = [d for d in self._disks()
-                 if not d[4] and d[3] in ("USB", "SD", "MMC", "1394")]
-        if not cands:
-            cands = [d for d in self._disks() if not d[4]]
-        if not cands:
-            sys.exit(color("No removable disks found. Plug in the card and retry.",
-                           ipod_flash.C_RED))
-        print(color("\nAttached removable disks:\n", ipod_flash.C_CYN), file=sys.stderr)
-        for i, (num, size, name, bus, _sys) in enumerate(cands):
-            print("  [%d] \\\\.\\PhysicalDrive%-3d %10s  %s (%s)" %
-                  (i, num, ipod_flash.fmt_size(size), name.strip(), bus), file=sys.stderr)
-        print(file=sys.stderr)
-        while True:
-            sel = input(color("Select device number (or 'q' to quit): ",
-                              ipod_flash.C_CYN)).strip()
-            if sel.lower() in ("q", "quit", ""):
-                sys.exit("Aborted.")
-            if sel.isdigit() and int(sel) < len(cands):
-                return "\\\\.\\PhysicalDrive%d" % cands[int(sel)][0]
-            print(color("  invalid selection", ipod_flash.C_RED), file=sys.stderr)
+
+        def render(cands):
+            print(color("\nAttached removable disks:\n", ipod_flash.C_CYN),
+                  file=sys.stderr)
+            for i, (num, size, name, bus, _sys) in enumerate(cands):
+                print("  [%d] \\\\.\\PhysicalDrive%-3d %10s  %s (%s)" %
+                      (i, num, ipod_flash.fmt_size(size), name.strip(), bus),
+                      file=sys.stderr)
+                if not size:
+                    # A multi-slot reader shows one disk per slot; an empty one
+                    # reports size 0 / "No Media". Say so, or it reads as a
+                    # normal target and every later failure ("could not
+                    # determine size", access denied) looks like a flashpod bug.
+                    print(color("        no card inserted — empty reader slot",
+                                ipod_flash.C_YEL), file=sys.stderr)
+            print(file=sys.stderr)
+
+        def to_path(d):
+            if not d[1]:
+                return None            # empty slot: rejected by pick_device
+            return "\\\\.\\PhysicalDrive%d" % d[0]
+
+        return ipod_flash.pick_device(
+            self._removable_disks, render, to_path,
+            "No removable disks found. Plug in the card and retry.")
 
     def device_sectors(self, dev):
         if os.path.isfile(dev):

{flashpod-0.2.2 → flashpod-0.2.4}/flashpod.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flashpod
-Version: 0.2.2
+Version: 0.2.4
 Summary: Command-line iPod sync + card-flashing tooling for early FireWire-era iPods, pure Python
 Author: David Barnhart
 License-Expression: MIT

{flashpod-0.2.2 → flashpod-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flashpod"
-version = "0.2.2"
+version = "0.2.4"
 description = "Command-line iPod sync + card-flashing tooling for early FireWire-era iPods, pure Python"
 readme = "README.md"
 requires-python = ">=3.6"