dwipe 1.0.2__py3-none-any.whl → 1.0.3__py3-none-any.whl

dwipe/main.py

@@ -307,6 +307,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 +334,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 +531,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):

{dwipe-1.0.2.dist-info → dwipe-1.0.3.dist-info}/METADATA

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

dwipe-1.0.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+dwipe/PowerWindow.py,sha256=pQGXsAMeuiHn-vtEiVG0rgW1eCslh3ukC-VrPhH_j3k,28587
+dwipe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dwipe/main.py,sha256=6Ooj1i7hCrFxVUkvjRphH_-Dxz3dpm201VrZVybiI8A,34309
+dwipe-1.0.3.dist-info/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
+dwipe-1.0.3.dist-info/METADATA,sha256=OBoF-WviZm4MNxeIpHWqF9QeeLnfb1BtQItlk93QBdU,4538
+dwipe-1.0.3.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+dwipe-1.0.3.dist-info/entry_points.txt,sha256=s-gAs_OhS9lr-oVMKii2ZjsLfCSO4-oHV7Wa9oJe-2g,42
+dwipe-1.0.3.dist-info/top_level.txt,sha256=nJT1SUDcOmULgmF9JmYwIIQLmXAIn6qAWW8EdWuxsAg,6
+dwipe-1.0.3.dist-info/RECORD,,

dwipe-1.0.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-dwipe/PowerWindow.py,sha256=pQGXsAMeuiHn-vtEiVG0rgW1eCslh3ukC-VrPhH_j3k,28587
-dwipe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dwipe/main.py,sha256=SyM9S69LkyLvhop3JbnlylGvCHzfv-Vgx8Qh2vhh2Ts,34200
-dwipe-1.0.2.dist-info/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
-dwipe-1.0.2.dist-info/METADATA,sha256=1vDa6BrAtgnmLjMO0qxx-K9mbtWKC4rjgvaHG8hcVbc,4538
-dwipe-1.0.2.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-dwipe-1.0.2.dist-info/entry_points.txt,sha256=s-gAs_OhS9lr-oVMKii2ZjsLfCSO4-oHV7Wa9oJe-2g,42
-dwipe-1.0.2.dist-info/top_level.txt,sha256=nJT1SUDcOmULgmF9JmYwIIQLmXAIn6qAWW8EdWuxsAg,6
-dwipe-1.0.2.dist-info/RECORD,,