flashpod 0.2.3__tar.gz → 0.2.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flashpod
-Version: 0.2.3
+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.3 → flashpod-0.2.4}/flashpod/ipod_flash.py

@@ -402,7 +402,10 @@ def pick_device(scan, render, path_of, empty_msg):
 
     ``scan()`` returns the candidate list (called again on each refresh),
     ``render(items)`` prints the table, ``path_of(item)`` yields the device path
-    to return.
+    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
@@ -430,7 +433,13 @@ def pick_device(scan, render, path_of, empty_msg):
                 render(items)
             continue
         if sel.isdigit() and int(sel) < len(items):
-            return path_of(items[int(sel)])
+            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)
 
 
@@ -481,7 +490,7 @@ def _render_candidates(cands):
 def choose_device():
     return pick_device(
         list_candidates, _render_candidates,
-        lambda d: "/dev/" + d["name"],
+        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):
@@ -795,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.3 → flashpod-0.2.4}/flashpod/platform/macos.py

@@ -85,9 +85,13 @@ class MacOSPlatform(Platform):
                       (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)
+            return ("/dev/" + d) if size else None   # 0 = empty reader slot
+
         return ipod_flash.pick_device(
-            self._external_disks, render,
-            lambda item: "/dev/" + item[0],
+            self._external_disks, render, to_path,
             "No external disks found. Plug in the card reader and retry.")
 
     def device_sectors(self, dev):

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

@@ -163,11 +163,22 @@ class WindowsPlatform(Platform):
                 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,
-            lambda d: "\\\\.\\PhysicalDrive%d" % d[0],
+            self._removable_disks, render, to_path,
             "No removable disks found. Plug in the card and retry.")
 
     def device_sectors(self, dev):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flashpod
-Version: 0.2.3
+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.3 → flashpod-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flashpod"
-version = "0.2.3"
+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"