statblk 1.22__tar.gz → 1.24__tar.gz

{statblk-1.22 → statblk-1.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: statblk
-Version: 1.22
+Version: 1.24
 Summary: Gather essential disk and partition info for block devices and print it in a nice table
 Home-page: https://github.com/yufei-pan/statblk
 Author: Yufei Pan

{statblk-1.22 → statblk-1.24}/statblk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: statblk
-Version: 1.22
+Version: 1.24
 Summary: Gather essential disk and partition info for block devices and print it in a nice table
 Home-page: https://github.com/yufei-pan/statblk
 Author: Yufei Pan

{statblk-1.22 → statblk-1.24}/statblk.py

@@ -276,7 +276,7 @@ except :
 	def cache_decorator(func):
 		return func
 
-version = '1.22'
+version = '1.24'
 VERSION = version
 __version__ = version
 COMMIT_DATE = '2025-09-10'
@@ -501,7 +501,9 @@ def get_read_write_rate_throughput_iter(sysfs_block_path):
 
 # DRIVE_INFO = namedtuple("DRIVE_INFO", 
 # 	["NAME", "FSTYPE", "SIZE", "FSUSEPCT", "MOUNTPOINT", "SMART","RTPT",'WTPT', "LABEL", "UUID", "MODEL", "SERIAL", "DISCARD"])
-def get_drives_info(print_bytes = False, use_1024 = False, mounted_only=False, best_only=False, formated_only=False, show_zero_size_devices=False,pseudo=False,tptDict = {},full=False):
+def get_drives_info(print_bytes = False, use_1024 = False, mounted_only=False, best_only=False, 
+					formated_only=False, show_zero_size_devices=False,pseudo=False,tptDict = {},
+					full=False,active_only=False):
 	lsblk_result = multiCMD.run_command(f'lsblk -brnp -o NAME,SIZE,FSTYPE,UUID,LABEL',timeout=2,quiet=True,wait_for_return=False,return_object=True)
 	block_devices = get_blocks()
 	smart_infos = {}
@@ -526,6 +528,8 @@ def get_drives_info(print_bytes = False, use_1024 = False, mounted_only=False, b
 	if lsblk_result.returncode == 0:
 		for line in lsblk_result.stdout:
 			lsblk_name, lsblk_size, lsblk_fstype, lsblk_uuid, lsblk_label = line.split(' ', 4)
+			if lsblk_name.startswith(os.path.sep):
+				lsblk_name = os.path.realpath(lsblk_name)
 			# the label can be \x escaped, we need to decode it
 			lsblk_uuid = bytes(lsblk_uuid, "utf-8").decode("unicode_escape")
 			lsblk_fstype = bytes(lsblk_fstype, "utf-8").decode("unicode_escape")
@@ -540,10 +544,12 @@ def get_drives_info(print_bytes = False, use_1024 = False, mounted_only=False, b
 				size_dict[lsblk_name] = int(lsblk_size)
 			except Exception:
 				pass
-	output = [["NAME", "FSTYPE", "SIZE", "FSUSE%", "MOUNTPOINT", "SMART", "LABEL", "UUID", "MODEL", "SERIAL", "DISCARD","RTPT",'WTPT']]
+	output = [["NAME", "FSTYPE", "SIZE", "FSUSE%", "MOUNTPOINT", "SMART", "LABEL", "UUID", "MODEL", "SERIAL", "DISCARD","READ",'WRITE']]
 	for device_name in target_devices:
 		if mounted_only and device_name not in mount_table:
 			continue
+		if active_only and device_name not in tptDict:
+			continue
 		fstype = ''
 		size = ''
 		fsusepct = ''
@@ -580,6 +586,8 @@ def get_drives_info(print_bytes = False, use_1024 = False, mounted_only=False, b
 		if device_name in tptDict:
 			try:
 				rtpt, wtpt = next(tptDict[device_name])
+				if active_only and rtpt == 0 and wtpt == 0:
+					continue
 				if print_bytes:
 					rtpt = str(rtpt)
 					wtpt = str(wtpt)
@@ -640,7 +648,8 @@ def main():
 	parser.add_argument('-F','-fo','--formated_only', help="Show only formated filesystems", action="store_true")
 	parser.add_argument('-M','-mo','--mounted_only', help="Show only mounted filesystems", action="store_true")
 	parser.add_argument('-B','-bo','--best_only', help="Show only shortest mount point for each device", action="store_true")
-	parser.add_argument('-a','--full', help="Show full device information, do not collapse drive info when length > console length", action="store_true")
+	parser.add_argument('-A','-ao','--active_only', help="Show only active devices (positive read/write activity)", action="store_true")
+	parser.add_argument('-R','--full', help="Show full device information, do not collapse drive info when length > console length", action="store_true")
 	parser.add_argument('-P','--pseudo', help="Include pseudo file systems as well (tmpfs / nfs / cifs etc.)", action="store_true")
 	parser.add_argument('--show_zero_size_devices', help="Show devices with zero size", action="store_true")
 	parser.add_argument('print_period', nargs='?', default=0, type=int, help="If specified as a number, repeat the output every N seconds")
@@ -652,7 +661,7 @@ def main():
 		results = get_drives_info(print_bytes = args.bytes, use_1024 = not args.si, 
 							mounted_only=args.mounted_only, best_only=args.best_only, 
 							formated_only=args.formated_only, show_zero_size_devices=args.show_zero_size_devices,
-							pseudo=args.pseudo,tptDict=tptDict,full=args.full)
+							pseudo=args.pseudo,tptDict=tptDict,full=args.full,active_only=args.active_only)
 		if args.json:
 			import json
 			print(json.dumps(results, indent=1))