mirror of https://github.com/aristocratos/bpytop
Merge branch 'net_iface'
commit
4b94be7080
|
@ -1,5 +1,10 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## v1.0.56
|
||||||
|
|
||||||
|
* Fixed: units_to_bytes returning 0 if input value <10 and in bits
|
||||||
|
* Added: Testing for some functions and classes
|
||||||
|
|
||||||
## v1.0.55
|
## v1.0.55
|
||||||
|
|
||||||
* Fixed: Disks usage and free meters not updating unless resized
|
* Fixed: Disks usage and free meters not updating unless resized
|
||||||
|
|
19
bpytop.py
19
bpytop.py
|
@ -179,6 +179,9 @@ net_sync=$net_sync
|
||||||
#* If the network graphs color gradient should scale to bandwith usage or auto scale, bandwith usage is based on "net_download" and "net_upload" values
|
#* If the network graphs color gradient should scale to bandwith usage or auto scale, bandwith usage is based on "net_download" and "net_upload" values
|
||||||
net_color_fixed=$net_color_fixed
|
net_color_fixed=$net_color_fixed
|
||||||
|
|
||||||
|
#* Starts with the Network Interface specified here.
|
||||||
|
net_iface=$net_iface
|
||||||
|
|
||||||
#* Show battery stats in top right if battery is present
|
#* Show battery stats in top right if battery is present
|
||||||
show_battery=$show_battery
|
show_battery=$show_battery
|
||||||
|
|
||||||
|
@ -360,7 +363,7 @@ class Config:
|
||||||
keys: List[str] = ["color_theme", "update_ms", "proc_sorting", "proc_reversed", "proc_tree", "check_temp", "draw_clock", "background_update", "custom_cpu_name",
|
keys: List[str] = ["color_theme", "update_ms", "proc_sorting", "proc_reversed", "proc_tree", "check_temp", "draw_clock", "background_update", "custom_cpu_name",
|
||||||
"proc_colors", "proc_gradient", "proc_per_core", "proc_mem_bytes", "disks_filter", "update_check", "log_level", "mem_graphs", "show_swap",
|
"proc_colors", "proc_gradient", "proc_per_core", "proc_mem_bytes", "disks_filter", "update_check", "log_level", "mem_graphs", "show_swap",
|
||||||
"swap_disk", "show_disks", "use_fstab", "net_download", "net_upload", "net_auto", "net_color_fixed", "show_init", "theme_background",
|
"swap_disk", "show_disks", "use_fstab", "net_download", "net_upload", "net_auto", "net_color_fixed", "show_init", "theme_background",
|
||||||
"net_sync", "show_battery", "tree_depth", "cpu_sensor", "show_coretemp", "proc_update_mult", "shown_boxes"]
|
"net_sync", "show_battery", "tree_depth", "cpu_sensor", "show_coretemp", "proc_update_mult", "shown_boxes", "net_iface"]
|
||||||
conf_dict: Dict[str, Union[str, int, bool]] = {}
|
conf_dict: Dict[str, Union[str, int, bool]] = {}
|
||||||
color_theme: str = "Default"
|
color_theme: str = "Default"
|
||||||
theme_background: bool = True
|
theme_background: bool = True
|
||||||
|
@ -393,10 +396,11 @@ class Config:
|
||||||
net_color_fixed: bool = False
|
net_color_fixed: bool = False
|
||||||
net_auto: bool = True
|
net_auto: bool = True
|
||||||
net_sync: bool = False
|
net_sync: bool = False
|
||||||
|
net_iface: str = ""
|
||||||
show_battery: bool = True
|
show_battery: bool = True
|
||||||
show_init: bool = True
|
show_init: bool = True
|
||||||
log_level: str = "WARNING"
|
log_level: str = "WARNING"
|
||||||
|
|
||||||
warnings: List[str] = []
|
warnings: List[str] = []
|
||||||
info: List[str] = []
|
info: List[str] = []
|
||||||
|
|
||||||
|
@ -3195,6 +3199,7 @@ class NetCollector(Collector):
|
||||||
timestamp: float = time()
|
timestamp: float = time()
|
||||||
net_min: Dict[str, int] = {"download" : -1, "upload" : -1}
|
net_min: Dict[str, int] = {"download" : -1, "upload" : -1}
|
||||||
auto_min: bool = CONFIG.net_auto
|
auto_min: bool = CONFIG.net_auto
|
||||||
|
net_iface: str = CONFIG.net_iface
|
||||||
sync_top: int = 0
|
sync_top: int = 0
|
||||||
sync_string: str = ""
|
sync_string: str = ""
|
||||||
|
|
||||||
|
@ -3218,9 +3223,14 @@ class NetCollector(Collector):
|
||||||
cls.nics.append(nic)
|
cls.nics.append(nic)
|
||||||
if not cls.nics: cls.nics = [""]
|
if not cls.nics: cls.nics = [""]
|
||||||
cls.nic = cls.nics[cls.nic_i]
|
cls.nic = cls.nics[cls.nic_i]
|
||||||
|
if cls.net_iface and cls.net_iface in cls.nics:
|
||||||
|
cls.nic = cls.net_iface
|
||||||
|
cls.nic_i = cls.nics.index(cls.nic)
|
||||||
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def switch(cls, key: str):
|
def switch(cls, key: str):
|
||||||
|
if cls.net_iface: cls.net_iface = ""
|
||||||
if len(cls.nics) < 2 and cls.nic in cls.nics:
|
if len(cls.nics) < 2 and cls.nic in cls.nics:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -4128,6 +4138,11 @@ class Menu:
|
||||||
'The bandwidth usage is based on the',
|
'The bandwidth usage is based on the',
|
||||||
'"net_download" and "net_upload" values set',
|
'"net_download" and "net_upload" values set',
|
||||||
'above.'],
|
'above.'],
|
||||||
|
"net_iface" : [
|
||||||
|
'Network Interface.',
|
||||||
|
'',
|
||||||
|
'Starts with the Network Interface specified here.',
|
||||||
|
''],
|
||||||
"show_battery" : [
|
"show_battery" : [
|
||||||
'Show battery stats.',
|
'Show battery stats.',
|
||||||
'',
|
'',
|
||||||
|
|
Loading…
Reference in New Issue