dwipe 1.0.4__py3-none-any.whl → 1.0.5__py3-none-any.whl

dwipe/main.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
-""" TBD
-
-
+"""
+dwipe: curse based tool to wipe physical disks or partitions including
+  markers to know their state when wiped.
 """
 # pylint: disable=too-many-branches,too-many-statements,import-outside-toplevel
 # pylint: disable=too-many-instance-attributes,invalid-name
@@ -290,6 +290,7 @@ class DeviceInfo:
             entry.fstype = device.get('fstype', '')
             if entry.fstype is None:
                 entry.fstype = ''
+            entry.type = device.get('type', '')
             entry.label = device.get('label', '')
             if not entry.label:
                 entry.label=device.get('partlabel', '')
@@ -319,7 +320,7 @@ class DeviceInfo:
 
                # Run the `lsblk` command and get its output in JSON format with additional columns
         result = subprocess.run(['lsblk', '-J', '--bytes', '-o',
-                    'NAME,MAJ:MIN,FSTYPE,LABEL,PARTLABEL,FSUSE%,SIZE,MOUNTPOINTS', ],
+                    'NAME,MAJ:MIN,FSTYPE,TYPE,LABEL,PARTLABEL,FSUSE%,SIZE,MOUNTPOINTS', ],
                     stdout=subprocess.PIPE, text=True, check=False)
         parsed_data = json.loads(result.stdout)
         entries = {}
@@ -413,47 +414,10 @@ class DeviceInfo:
 
     def get_disk_partitions(self, nss):
         """ Determine which partitions we want some are bogus like zram """
-
-        def whitelisted(device_name):
-            """Check if device_name matches any pattern in whitelist
-            which are the disk devices."""
-            WHITELIST = ['nvme*', 'sd*', 'hd*', 'mmcblk*']
-            for pattern in WHITELIST:
-                if fnmatch(device_name, pattern):
-                    return True
-            return False
-
-        def blacklisted(device_name):
-            """Check if device_name matches any pattern in black list
-              which are know not to be physical disks."""
-            BLACKLIST = ['zram*', 'ram*', 'dm-*', 'loop*', 'sr*']
-            for pattern in BLACKLIST:
-                if fnmatch(device_name, pattern):
-                    return 'blkLst'
-            return ''
-
-        def writable(device_name):
-            """Check if the device is writable."""
-            device_path = f'/dev/{device_name}'
-            try: # Check if the device file exists and is writable
-                return os.access(device_path, os.W_OK)
-            except FileNotFoundError:
-                return False
-
         ok_nss = {}
         for name, ns in nss.items():
-            if ns.major in self.disk_majors or whitelisted(name):
-                ok_nss[name] = ns
-                continue
-            if blacklisted(name):
-                continue
-            if writable(name):
-                if self.DB:
-                    print(r'DB:include {repr(name)} [not white/black but writable]')
+            if ns.type in ('disk', 'part'):
                 ok_nss[name] = ns
-                continue
-            if self.DB:
-                print(r'DB:exclude {repr(name)} [not white/black but unwritable]')
         return ok_nss
 
     def compute_field_widths(self, nss):
@@ -858,7 +822,8 @@ class DiskWipe:
                         partition.state = pct
                         partition.mounts = [f'{elapsed} {rate} REM:{until}']
 
-                    if partition.parent and self.partitions[partition.parent].state == 'Lock':
+                    if partition.parent and partition.parent in self.partitions and (
+                            self.partitions[partition.parent].state == 'Lock'):
                         continue
 
                     if wanted(name) or partition.job:

{dwipe-1.0.4.dist-info → dwipe-1.0.5.dist-info}/METADATA

@@ -1,20 +1,18 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dwipe
-Version: 1.0.4
+Version: 1.0.5
 Summary: A tool to wipe disks and partitions for Linux
-Author-email: Joe Defen <joedef@google.com>
-License: MIT
-Project-URL: Homepage, https://github.com/joedefen/dwipe
-Project-URL: Bug Tracker, https://github.com/joedefen/dwipe/issues
 Keywords: disk,partition,wipe,clean,scrub
+Author-email: Joe Defen <joedef@google.com>
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX :: Linux
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: psutil>=5.9
-Requires-Dist: importlib-metadata; python_version < "3.8"
+Requires-Dist: importlib-metadata; python_version<"3.8"
+Project-URL: Bug Tracker, https://github.com/joedefen/dwipe/issues
+Project-URL: Homepage, https://github.com/joedefen/dwipe
 
 # dwipe
 `dwipe` is tool to wipe disks and partitions for Linux helps secure you data. `dwipes` aims to reduce mistakes by providing ample information about your devices during selection.

dwipe-1.0.5.dist-info/RECORD

@@ -0,0 +1,8 @@
+dwipe/PowerWindow.py,sha256=pQGXsAMeuiHn-vtEiVG0rgW1eCslh3ukC-VrPhH_j3k,28587
+dwipe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dwipe/main.py,sha256=MutcKcddLhBJeegULUwjHOzZRV2gR-QluA1UarRHyIU,33909
+dwipe-1.0.5.dist-info/entry_points.txt,sha256=SZHFezmse2c-jxG-BJ0TXy_TZ8vVFf0lPJWs0cdxz6Y,41
+dwipe-1.0.5.dist-info/licenses/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
+dwipe-1.0.5.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+dwipe-1.0.5.dist-info/METADATA,sha256=hrmh76lFi0rfExxRmCzGSIeEWFTwy1DfLfko7DKofS8,4496
+dwipe-1.0.5.dist-info/RECORD,,

{dwipe-1.0.4.dist-info → dwipe-1.0.5.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py3-none-any
-

dwipe-1.0.5.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+dwipe=dwipe.main:main
+

dwipe-1.0.4.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=8QEm6xgyDDZ2HUA4BkbJE1DWe9GuyCcQMtsA9_8T1OY,35153
-dwipe-1.0.4.dist-info/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
-dwipe-1.0.4.dist-info/METADATA,sha256=JoYXNTP-HsJjHjN1YFK-nkYGbCaAIlH4V0IMpRrpf7E,4538
-dwipe-1.0.4.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-dwipe-1.0.4.dist-info/entry_points.txt,sha256=s-gAs_OhS9lr-oVMKii2ZjsLfCSO4-oHV7Wa9oJe-2g,42
-dwipe-1.0.4.dist-info/top_level.txt,sha256=nJT1SUDcOmULgmF9JmYwIIQLmXAIn6qAWW8EdWuxsAg,6
-dwipe-1.0.4.dist-info/RECORD,,

dwipe-1.0.4.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-dwipe = dwipe.main:main

dwipe-1.0.4.dist-info/top_level.txt

@@ -1 +0,0 @@
-dwipe