flashpod 0.2.3__tar.gz → 0.2.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flashpod
-Version: 0.2.3
+Version: 0.2.5
 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.5}/flashpod/__init__.py

@@ -4,4 +4,4 @@
 Pure Python, no libgpod. See the README for usage.
 """
 
-__version__ = "0.2.0"
+__version__ = "0.2.5"

{flashpod-0.2.3 → flashpod-0.2.5}/flashpod/cli.py

@@ -354,8 +354,18 @@ def _sudo_reexec(extra):
     """Re-exec this same flashpod under sudo with ``extra`` args appended
     (prompting for the password on a terminal). REPLACES the process and never
     returns on success; returns only if it can't elevate (non-tty / no sudo)."""
-    if os.name == "nt" or not sys.stdin.isatty():
-        return                                     # can't prompt — caller handles it
+    if not sys.stdin.isatty():
+        return
+    if os.name == "nt":
+        # Windows 11 24H2+ ships sudo.exe.  In "Inline" mode it elevates
+        # within the same console, preserving interactive prompts — unlike
+        # ShellExecute "runas" which opens a detached window.  The
+        # environment is inherited, so no env/PYTHONPATH dance needed.
+        cmd = ["sudo"] + _self_cmd() + extra
+        try:
+            sys.exit(subprocess.call(cmd))
+        except OSError:
+            return                                 # no sudo.exe — caller handles it
     # sudo resets the environment, so the FLASHPOD_* tuning knobs the user set
     # would be lost across elevation. Re-assert them in the child via `env`.
     passthru = ["%s=%s" % (k, v) for k, v in sorted(os.environ.items())
@@ -2424,16 +2434,15 @@ def main():
             return 0
         plat = platform.current()
         if not opts.dry_run and not plat.is_admin():
-            # Writing to a disk needs root — elevate via sudo (prompts for the
-            # password on a terminal) rather than just bailing, like the raw
-            # data commands do.
-            if os.name != "nt" and sys.stdin.isatty():
-                print("flashpod flash: writing to a disk needs root — "
-                      "elevating via sudo...", file=sys.stderr)
+            # Writing to a disk needs elevation — try sudo (prompts for
+            # credentials or shows a UAC dialog) rather than just bailing.
+            if sys.stdin.isatty():
+                role = "Administrator" if os.name == "nt" else "root"
+                print("flashpod flash: writing to a disk needs %s — "
+                      "elevating via sudo..." % role, file=sys.stderr)
                 _sudo_reexec(_cmd_args(opts))    # re-execs; returns only if sudo is missing
             msg = "flashpod flash: " + plat.privilege_hint()
-            if os.name != "nt":           # offer the exact sudo rerun on POSIX
-                msg += "\n  sudo " + " ".join(_self_cmd() + _cmd_args(opts))
+            msg += "\n  sudo " + " ".join(_self_cmd() + _cmd_args(opts))
             print(msg, file=sys.stderr)
             return 1
         max_data_gb = None

{flashpod-0.2.3 → flashpod-0.2.5}/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.5}/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.5}/flashpod/platform/windows.py

@@ -92,6 +92,9 @@ def _drive_number(dev):
 class WindowsPlatform(Platform):
     name = "windows"
 
+    def __init__(self):
+        self._held_locks = []   # [(handle_path, win_handle), ...]
+
     # -- privilege --------------------------------------------------------
     def is_admin(self):
         try:
@@ -163,11 +166,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):
@@ -202,11 +216,29 @@ class WindowsPlatform(Platform):
             num = _drive_number(dev)
         except ValueError:
             return []
+        # AccessPaths covers both drive letters (D:\) and volume GUID
+        # paths (\\?\Volume{...}\).  The old DriveLetter-only filter missed
+        # letterless volumes, so their sectors were never locked and raw
+        # writes failed with access-denied / bad-file-descriptor.
         txt = _powershell(
-            "Get-Partition -DiskNumber %d | Where-Object DriveLetter | "
-            "ForEach-Object { $_.DriveLetter }" % num)
-        return [("%s:" % c.strip(), "%s:\\" % c.strip())
-                for c in txt.splitlines() if c.strip()]
+            "Get-Partition -DiskNumber %d -ErrorAction SilentlyContinue"
+            " | ForEach-Object { foreach ($a in $_.AccessPaths) { $a } }"
+            % num)
+        seen = set()
+        results = []
+        for line in txt.splitlines():
+            p = line.strip()
+            if not p or p in seen:
+                continue
+            seen.add(p)
+            if len(p) >= 2 and p[1] == ':':
+                # Drive letter: D:\ -> ("D:", "D:\")
+                results.append((p[:2], p))
+            elif p.startswith('\\\\?\\'):
+                # Volume GUID: \\?\Volume{...}\ -> ("Volume{...}", path)
+                # _lock_volumes prepends \\.\ to build \\.\Volume{...}
+                results.append((p[4:].rstrip('\\'), p))
+        return results
 
     def validate_target(self, dev, dry_run):
         from .. import ipod_flash
@@ -221,20 +253,44 @@ class WindowsPlatform(Platform):
                 sys.exit(color("refusing: PhysicalDrive%d backs the running system." % num, red))
 
     # -- mutation around the raw write ------------------------------------
-    def unmount_all(self, dev, dry):
-        if dry:
-            return
+    def _lock_volumes(self, dev):
+        """Lock and dismount every volume on *dev*, holding the handles so
+        Windows cannot remount between write_layout and format_data.
+
+        Safe to call more than once: volumes already locked are skipped, and
+        volumes that appeared since the previous call (e.g. after an MBR
+        rewrite) are picked up."""
+        already = {v for v, _h in self._held_locks}
         for vol, _mp in self.device_mountpoints(dev):
+            handle_path = "\\\\.\\%s" % vol.rstrip("\\")
+            if handle_path in already:
+                continue
             try:
-                h = self._open_handle("\\\\.\\%s" % vol.rstrip("\\"), write=True)
+                h = self._open_handle(handle_path, write=True)
                 try:
                     self._ioctl(h, FSCTL_LOCK_VOLUME)
                     self._ioctl(h, FSCTL_DISMOUNT_VOLUME)
-                finally:
-                    ctypes.windll.kernel32.CloseHandle(h)
+                    self._held_locks.append((handle_path, h))
+                except OSError:
+                    _k32().CloseHandle(h)
             except OSError:
                 pass
 
+    def _release_locks(self):
+        """Close all held volume-lock handles."""
+        k = _k32()
+        for _vol, h in self._held_locks:
+            try:
+                k.CloseHandle(h)
+            except Exception:                           # noqa: BLE001
+                pass
+        self._held_locks = []
+
+    def unmount_all(self, dev, dry):
+        if dry:
+            return
+        self._lock_volumes(dev)
+
     def wipe_signatures(self, dev, dry):
         return  # raw zeroing in write_layout handles this
 
@@ -259,6 +315,7 @@ class WindowsPlatform(Platform):
             pass
 
     def eject(self, dev, dry):
+        self._release_locks()
         if dry:
             return
         try:
@@ -276,12 +333,12 @@ class WindowsPlatform(Platform):
         import msvcrt
         write = ("w" in mode or "+" in mode or "a" in mode)
         if write:
-            # FSCTL_LOCK_VOLUME only holds while the locking handle is open, so
-            # the dismount done before write_layout is already undone by now:
-            # writing the new MBR makes Windows rescan and re-mount the data
-            # partition, and it then refuses writes into those sectors. Dismount
-            # again immediately before each write open.
-            self.unmount_all(dev, False)
+            # Lock (and hold) every volume on this disk so Windows cannot
+            # remount between write_layout's MBR write and format_data's
+            # FAT32 write.  Handles are kept alive in self._held_locks and
+            # released in eject().  _lock_volumes is incremental — safe to
+            # call on every open.
+            self._lock_volumes(dev)
         h = self._open_handle(dev, write=write)
         fd = msvcrt.open_osfhandle(h, os.O_BINARY)
         return AlignedRawIO(os.fdopen(fd, mode, buffering=0))

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

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

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