dwipe 3.0.0__py3-none-any.whl → 3.0.1__py3-none-any.whl

dwipe/DeviceInfo.py

@@ -112,7 +112,11 @@ class DeviceInfo:
         if ns.hw_caps_state == ProbeState.READY:
             return ns.hw_caps, ns.hw_nopes
 
-        # 2. Skip probing if device has active job (would block on SATA wipe)
+        # 2. Skip probing non-wipeable devices (mounted/blocked)
+        if ns.state in ('Mnt', 'iMnt', 'Blk', 'iBlk', 'Busy'):
+            return ns.hw_caps, ns.hw_nopes
+
+        # 3. Skip probing if device has active job (would block on SATA wipe)
         if ns.job:
             return ns.hw_caps, ns.hw_nopes
 

dwipe/DeviceWorker.py

@@ -111,11 +111,17 @@ class DeviceWorker(threading.Thread):
         self._running = False
         self._work_queue.put('stop')
 
-    def request_hw_caps(self):
-        """Request hardware capabilities probe (non-blocking)."""
+    def request_hw_caps(self, force=False):
+        """Request hardware capabilities probe (non-blocking).
+        Args:
+            force: If True, reset cached state and re-probe even if already done.
+        """
         with self._lock:
-            if self._state['hw_caps_state'] == ProbeState.PENDING:
+            if force or self._state['hw_caps_state'] == ProbeState.PENDING:
                 self._state['hw_caps_state'] = ProbeState.PROBING
+                self._state['hw_caps'] = ''
+                self._state['hw_caps_summary'] = ''
+                self._state['hw_nopes'] = ''
                 self._work_queue.put('hw_caps')
 
     def set_want_marker(self, want):
@@ -460,12 +466,12 @@ class DeviceWorkerManager:
                 worker.start()
                 self._workers[name] = worker
 
-    def request_hw_caps(self, device_name):
+    def request_hw_caps(self, device_name, force=False):
         """Request hardware capabilities probe for a device."""
         with self._lock:
             worker = self._workers.get(device_name)
             if worker:
-                worker.request_hw_caps()
+                worker.request_hw_caps(force=force)
 
     def set_want_marker(self, device_name, want):
         """Set whether we want to monitor for a marker on a device.

dwipe/DiskWipe.py

@@ -446,11 +446,10 @@ class DiskWipe:
             # Don't probe mounted/blocked devices
             if ns.state in ('Mnt', 'iMnt', 'Blk', 'iBlk'):
                 continue
-            # Reset state to PENDING to force a re-probe if needed
-            # (state stays READY even after wipe clears results)
+            # Re-probe after wipe: worker state is still READY, need force
             if not (ns.hw_caps or ns.hw_nopes):
                 ns.hw_caps_state = ProbeState.PENDING
-            # Probe any device that might be ready (s, W, -, ^, or wipeable state)
+                self.worker_manager.request_hw_caps(ns.name, force=True)
             self.dev_info.get_hw_capabilities(ns)
 
     def _poll_hw_caps_updates(self):
@@ -506,6 +505,7 @@ class DiskWipe:
         self.partitions = info.assemble_partitions(self.partitions)
         # Start probing hw_caps immediately instead of waiting for first 3s refresh
         self.dev_info = info
+        self.worker_manager = worker_manager
         self.get_hw_caps_when_needed()
         if self.opts.dump_lsblk:
             DeviceInfo.dump(self.partitions, title="after assemble_partitions")
@@ -551,8 +551,6 @@ class DiskWipe:
 
         # Background device change monitor started above
 
-        # self.dev_info already set during startup probe above
-        self.worker_manager = worker_manager
         pick_range = info.get_pick_range()
         self.win.set_pick_range(pick_range[0], pick_range[1])
 
@@ -577,9 +575,20 @@ class DiskWipe:
                 # This lets us show results quickly even though commands take 1-3 seconds
                 self._poll_hw_caps_updates()
 
+                # Detect suspend/resume: loop runs every ~0.25s, so a large
+                # gap in monotonic time means the system was likely suspended
+                now_mono = time.monotonic()
+                loop_gap = now_mono - check_devices_mono
+                if loop_gap > 5.0 and hasattr(self, '_last_loop_mono'):
+                    suspend_gap = now_mono - self._last_loop_mono
+                    if suspend_gap > 5.0:
+                        self.win.flash(f'Suspend detected ({suspend_gap:.0f}s gap), rescanning...', duration=1.5)
+                        self.screens[MAIN_ST].scan_all_devices_ACTION()
+                self._last_loop_mono = now_mono
+
                 # Check for device changes from background monitor
                 devices_changed = device_monitor.get_and_clear()
-                time_since_refresh = time.monotonic() - check_devices_mono
+                time_since_refresh = now_mono - check_devices_mono
 
                 # Build current worker state for comparison
                 current_worker_state = {}
@@ -1188,7 +1197,7 @@ class MainScreen(DiskWipeScreen):
                 # Queue worker to re-probe this device's capabilities
                 if partition.parent: # only need to do whole disks
                     continue
-                self.app.worker_manager.request_hw_caps(partition.name)
+                self.app.worker_manager.request_hw_caps(partition.name, force=True)
                 # Clear cached values so UI refreshes with new probing state
                 partition.hw_caps = ''
                 partition.hw_nopes = ''

{dwipe-3.0.0.dist-info → dwipe-3.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dwipe
-Version: 3.0.0
+Version: 3.0.1
 Summary: A tool to wipe disks and partitions for Linux
 Keywords: disk,partition,wipe,clean,scrub
 Author-email: Joe Defen <joedef@google.com>
@@ -81,7 +81,7 @@ Project-URL: Homepage, https://github.com/joedefen/dwipe
 1. **Drives and the OS often lie about drive type.** Outwit them both:
     * For spinning HDDs, **always** use `Rand` or `Zero` (interruptible, shows progress).
     * For SSDs, **always** use firmware wipes if available (faster, reaches hidden blocks).
-1. **If a drive is 'Frozen'**, press `DEL` to detach it and, when gone, press `r` to rescan; it should come back unfrozen.
+1. **If a drive is 'Frozen'**, suspend your system briefly and resume; `dwipe` auto-detects the resume and rescans. Or press `r` to rescan manually. The drive should come back unfrozen.
 1. **If a drive is 'Locked'**, you must unlock it manually (see "Unlock Locked Device" section below). If `dwipe` locked it, the password is `NULL`; otherwise use the password that locked it.
 1. **Hot-swap workflow for SATA drives**: `DEL` to detach, physically swap drives, then `r` to rescan (if needed).
 
@@ -477,11 +477,10 @@ Press **ESC** from the main screen to clear the filter and return to showing all
 Firmware wipes (SATA/NVMe secure erase operations) have different characteristics than software wipes:
 
 **Frozen Drives:**
-- Firmware wipes sometimes report the drive as "Frozen" if the device is present (mounted or in use) when capabilities are detected
+- SATA drives are typically frozen by the BIOS/UEFI during POST as a security measure
 - This is a drive-level security feature, not a `dwipe` limitation
-- **Solution**: Unmount the device, wait briefly (often just a few seconds of idle time is enough), then use **r** to rescan capabilities
-- The freeze state is usually temporary and clears after the device is no longer actively in use
-- If the drive remains frozen, try hot-swapping (remove and reinsert) or power-cycling the device
+- **Solution**: Suspend your system briefly and resume; `dwipe` auto-detects the resume and rescans (or press **r** manually). The suspend/resume power-cycles the SATA link which clears the freeze.
+- If the drive remains frozen after suspend/resume, try a full power-off (10+ minutes to drain drive capacitors) followed by boot and rescan
 
 **Device Quirks and Compatibility:**
 - Storage devices have various firmware implementations and hardware quirks that affect secure erase operations

{dwipe-3.0.0.dist-info → dwipe-3.0.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 dwipe/DeviceChangeMonitor.py,sha256=0E8ie0ArhGQDq2g3bp_Sb-8Bo94PyoNzlGtWjotmqVU,8889
-dwipe/DeviceInfo.py,sha256=C5yNtXHJUUFhq0B8VtnvwFfcedcOqutRVS9NBhO5Jlk,47701
-dwipe/DeviceWorker.py,sha256=aHordCJCZXpq15tJ40VRbnzMqxBaBwd4sS5AGWuGNrE,21583
-dwipe/DiskWipe.py,sha256=awTlDIKBqNgh6LjbONxC-vPVFa-IsW3klv4AOxYnwOs,74269
+dwipe/DeviceInfo.py,sha256=z0l_lQt75hTvj_VkE6QpcjTitEV5RrOL5jkJ1m7j3ZM,47873
+dwipe/DeviceWorker.py,sha256=2ljht0f_i1q0PpSxdZyVXaTbOdFa7ul_abAOpJ7LPio,21875
+dwipe/DiskWipe.py,sha256=Xyz7A9YVkwgWjCvcHGLYcTYkyCuX6J4_XzJoR20jMlM,74813
 dwipe/DrivePreChecker.py,sha256=txH-olWN7Xu2OZ6vV_Mz3cM8ffCxCd5KR0xtXdu65VM,8325
 dwipe/FirmwareWipeTask.py,sha256=zaMsICmpqAhceMnV5DIIGrQ_dk_KnklMxVIixVIiIO8,34387
 dwipe/NvmeTool.py,sha256=FdRNC9dhMoJxVjO2JdJ58DJai2WDRwuUavfiBG7-wAY,8510
@@ -17,8 +17,8 @@ dwipe/WipeTask.py,sha256=rISF7ZweQbELhf6tSLjtZp3FCaLhboSq1V3oAXDr6JU,5562
 dwipe/WriteTask.py,sha256=QyYvDovWyRcfli3bUZ-lrU91_sEG5mBJOTJduEJYLco,16178
 dwipe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dwipe/main.py,sha256=vedLjuYZCMZ2-CV_kAJ_0yfVHw88r-SiY6mVHWcI1r0,3577
-dwipe-3.0.0.dist-info/entry_points.txt,sha256=SZHFezmse2c-jxG-BJ0TXy_TZ8vVFf0lPJWs0cdxz6Y,41
-dwipe-3.0.0.dist-info/licenses/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
-dwipe-3.0.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-dwipe-3.0.0.dist-info/METADATA,sha256=XtzIZjSqytU8ukc1u9fabpSUz4bIYUnTlBXAcm2TFB4,31916
-dwipe-3.0.0.dist-info/RECORD,,
+dwipe-3.0.1.dist-info/entry_points.txt,sha256=SZHFezmse2c-jxG-BJ0TXy_TZ8vVFf0lPJWs0cdxz6Y,41
+dwipe-3.0.1.dist-info/licenses/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
+dwipe-3.0.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+dwipe-3.0.1.dist-info/METADATA,sha256=pQ64vukpjVvWVH3D9uqA9RX1Ar64swbu4RQplgGo7II,31939
+dwipe-3.0.1.dist-info/RECORD,,