dwipe 1.0.2__tar.gz → 1.0.4__tar.gz

{dwipe-1.0.2/src/dwipe.egg-info → dwipe-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dwipe
-Version: 1.0.2
+Version: 1.0.4
 Summary: A tool to wipe disks and partitions for Linux
 Author-email: Joe Defen <joedef@google.com>
 License: MIT

{dwipe-1.0.2 → dwipe-1.0.4}/pyproject.toml

@@ -47,7 +47,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dwipe"
-version = "1.0.2"
+version = "1.0.4"
 description = "A tool to wipe disks and partitions for Linux"
 authors = [
     { name = "Joe Defen", email = "joedef@google.com" }

{dwipe-1.0.2 → dwipe-1.0.4}/src/dwipe/main.py

@@ -79,6 +79,7 @@ class WipeJob:
         self.total_written = 0
         self.wr_hists = []  # list of (mono, written)
         self.done = False
+        self.exception = None # in case of issues
 
     @staticmethod
     def start_job(device_path, total_size, opts):
@@ -185,38 +186,43 @@ class WipeJob:
         self.total_written = 0  # Track total bytes written
         is_random = self.opts.random
 
-        with open(self.device_path, 'wb') as device:
-            # for loop in range(10000000000):
-            offset = 0
-            chunk = memoryview(WipeJob.zero_buffer)
-            while True:
-                if self.do_abort:
-                    break
-                if is_random:
-                    offset = random.randint(0, WipeJob.BUFFER_SIZE - WipeJob.WRITE_SIZE)
-                    # Use memoryview to avoid copying the data
-                    chunk = memoryview(WipeJob.buffer)[offset:offset + WipeJob.WRITE_SIZE]
-
-                if self.opts.dry_run:
-                    bytes_written = self.total_size // 120
-                    time.sleep(0.25)
-                else:
-                    try:
-                        bytes_written = device.write(chunk)
-                    except Exception:
-                        bytes_written = 0
-                self.total_written += bytes_written
-                # Optional: Check for errors or incomplete writes
-                if bytes_written < WipeJob.WRITE_SIZE:
-                    break
-                if self.opts.dry_run and self.total_written >= self.total_size:
-                    break
-            # clear the beginning of device whether aborted or not
-            # if we have started writing + status in JSON
-            if not self.opts.dry_run and self.total_written > 0 and is_random:
-                device.seek(0)
-                # chunk = memoryview(WipeJob.zero_buffer)
-                bytes_written = device.write(self.prep_marker_buffer(is_random))
+        try:
+            with open(self.device_path, 'wb') as device:
+                # for loop in range(10000000000):
+                offset = 0
+                chunk = memoryview(WipeJob.zero_buffer)
+                while True:
+                    # foo = 1/0  # to force exception only
+                    if self.do_abort:
+                        break
+                    if is_random:
+                        offset = random.randint(0, WipeJob.BUFFER_SIZE - WipeJob.WRITE_SIZE)
+                        # Use memoryview to avoid copying the data
+                        chunk = memoryview(WipeJob.buffer)[offset:offset + WipeJob.WRITE_SIZE]
+
+                    if self.opts.dry_run:
+                        bytes_written = self.total_size // 120
+                        time.sleep(0.25)
+                    else:
+                        try:
+                            bytes_written = device.write(chunk)
+                        except Exception:
+                            bytes_written = 0
+                    self.total_written += bytes_written
+                    # Optional: Check for errors or incomplete writes
+                    if bytes_written < WipeJob.WRITE_SIZE:
+                        break
+                    if self.opts.dry_run and self.total_written >= self.total_size:
+                        break
+                # clear the beginning of device whether aborted or not
+                # if we have started writing + status in JSON
+                if not self.opts.dry_run and self.total_written > 0:
+                    device.seek(0)
+                    # chunk = memoryview(WipeJob.zero_buffer)
+                    bytes_written = device.write(self.prep_marker_buffer(is_random))
+        except Exception:
+            self.exception = traceback.format_exc()
+
         self.done = True
 
 class DeviceInfo:
@@ -307,6 +313,7 @@ class DeviceInfo:
                     state = 'W' if pct >= 100 else 's'
                     dt = datetime.datetime.fromtimestamp(marker.unixtime)
                     entry.marker = f'{state} {pct}% {marker.mode} {dt.strftime('%Y/%m/%d %H:%M')}'
+                    entry.state = state
 
             return entry
 
@@ -333,8 +340,6 @@ class DeviceInfo:
                 if entry.mounts:
                     entry.state = 'Mnt'
                     parent.state = 'Mnt'
-                elif entry.marker:
-                    entry.state = entry.marker[0]
 
         if self.DB:
             print('\n\nDB: --->>> after parse_lsblk:')
@@ -532,18 +537,21 @@ class DeviceInfo:
             if new_ns:
                 if prev_ns.job:
                     new_ns.job = prev_ns.job
-                new_ns.state = new_ns.dflt = prev_ns.dflt
+                new_ns.dflt = prev_ns.dflt
+
                 if prev_ns.state == 'Lock':
-                    pass
-                if prev_ns.state not in ('Busy', 'Unlk'): # re-infer these
-                    new_ns.state = prev_ns.state
+                    new_ns.state = 'Lock'
+                elif new_ns.state not in ('s', 'W'):
+                    new_ns.state = new_ns.dflt
+                    if prev_ns.state not in ('s', 'W', 'Busy', 'Unlk'):
+                        new_ns.state = prev_ns.state # re-infer these
             elif prev_ns.job:
                 # unplugged device with job..
                 nss[name] = prev_ns # carry forward
                 prev_ns.job.do_abort = True
-        for name, prev_ns in nss.items():
-            if name not in prev_nss:
-                prev_ns.state = '^'
+        for name, new_ns in nss.items():
+            if name not in prev_nss and new_ns.state not in ('s', 'W'):
+                new_ns.state = '^'
         return nss
 
     def assemble_partitions(self, prev_nss=None):
@@ -753,6 +761,8 @@ class DiskWipe:
         line += ' Stop' if self.job_cnt > 0 else ''
         line += f' quit ?:help /{self.prev_filter}  Mode='
         line += f'{"Random" if self.opts.random else "Zeros"}'
+        if self.opts.dry_run:
+            line += ' DRY-RUN'
         # for action in self.actions:
             # line += f' {action[0]}:{action}'
         return line[1:]
@@ -832,9 +842,17 @@ class DiskWipe:
                             to='s' if partition.job.do_abort else 'W'
                             self.set_state(partition, to=to)
                             partition.dflt = to
-                            partition.job = None
                             partition.mounts = []
                             self.job_cnt -= 1
+                            if partition.job.exception:
+                                self.win.stop_curses()
+                                print('\n\n\n==========   ALERT  =========\n')
+                                print(f' FAILED: wipe {repr(partition.name)}')
+                                print(partition.job.exception)
+                                input('\n\n===== Press ENTER to continue ====> ')
+                                self.win._start_curses()
+
+                            partition.job = None
                     if partition.job:
                         elapsed, pct, rate, until = partition.job.get_status()
                         partition.state = pct

{dwipe-1.0.2 → dwipe-1.0.4/src/dwipe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dwipe
-Version: 1.0.2
+Version: 1.0.4
 Summary: A tool to wipe disks and partitions for Linux
 Author-email: Joe Defen <joedef@google.com>
 License: MIT