jinql
/
bpytop
mirror of https://github.com/aristocratos/bpytop
1
0
Fork 0
Code Issues Releases Wiki Activity

Changed: Disks filtering now uses full mountpoint path for better accuracy

pull/219/head
aristocratos 2020-12-19 17:15:27 +01:00
parent 4a7e49883b
commit 4fe5979b21
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bpytop.py
View File

@ -152,8 +152,8 @@ background_update=$background_update
#* Custom cpu model name, empty string to disable. #* Custom cpu model name, empty string to disable.
custom_cpu_name="$custom_cpu_name" custom_cpu_name="$custom_cpu_name"
#* Optional filter for shown disks, should be last folder in path of a mountpoint, "root" replaces "/", separate multiple values with comma. #* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with a comma ",".
#* Begin line with "exclude=" to change to exclude filter, oterwise defaults to "most include" filter. Example: disks_filter="exclude=boot, home" #* Begin line with "exclude=" to change to exclude filter, oterwise defaults to "most include" filter. Example: disks_filter="exclude=/boot, /home/user"
disks_filter="$disks_filter" disks_filter="$disks_filter"
#* Show graphs instead of meters for memory values. #* Show graphs instead of meters for memory values.
@ -2980,11 +2980,11 @@ class MemCollector(Collector):
disk_io = None disk_io = None
io_string = "" io_string = ""
disk_name = disk.mountpoint.rsplit('/', 1)[-1] if not disk.mountpoint == "/" else "root" disk_name = disk.mountpoint.rsplit('/', 1)[-1] if not disk.mountpoint == "/" else "root"
while disk_name in disk_list: disk_name += "_" #while disk_name in disk_list: disk_name += "_"
disk_list += [disk_name] disk_list += [disk_name]
if cls.excludes and disk.fstype in cls.excludes: if cls.excludes and disk.fstype in cls.excludes:
continue continue
if filtering and ((not filter_exclude and not disk_name.endswith(filtering)) or (filter_exclude and disk_name.endswith(filtering))): if filtering and ((not filter_exclude and not disk.mountpoint in filtering) or (filter_exclude and disk.mountpoint in filtering)):
continue continue
#elif filtering and disk_name.endswith(filtering) #elif filtering and disk_name.endswith(filtering)
if SYSTEM == "MacOS" and disk.mountpoint == "/private/var/vm": if SYSTEM == "MacOS" and disk.mountpoint == "/private/var/vm":
@ -3907,14 +3907,14 @@ class Menu:
"disks_filter" : [ "disks_filter" : [
'Optional filter for shown disks.', 'Optional filter for shown disks.',
'', '',
'Should be last folder in path of a mountpoint,', 'Should be full path of a mountpoint,',
'"root" replaces "/", separate multiple values', '"root" replaces "/", separate multiple values',
'with a comma.', 'with a comma ",".',
'Begin line with "exclude=" to change to exclude', 'Begin line with "exclude=" to change to exclude',
'filter.', 'filter.',
'Oterwise defaults to "most include" filter.', 'Oterwise defaults to "most include" filter.',
'', '',
'Example: disks_filter="exclude=boot, home"'], 'Example: disks_filter="exclude=/boot, /home/user"'],
"mem_graphs" : [ "mem_graphs" : [
'Show graphs for memory values.', 'Show graphs for memory values.',
'', '',