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

Fixed bad assumption of cpu model name string contents.

pull/27/head
aristocratos 2020-08-03 17:02:34 +02:00
parent eba317535e
commit fd8852a160
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bpytop.py
View File

@ -154,7 +154,7 @@ show_init=$show_init
#* Enable check for new version from github.com/aristocratos/bpytop at start. #* Enable check for new version from github.com/aristocratos/bpytop at start.
update_check=$update_check update_check=$update_check
#* Enable start in mini mode, can be toggled with ctrl+m at any time. #* Enable start in mini mode, can be toggled with shift+m at any time.
mini_mode=$mini_mode mini_mode=$mini_mode
#* Set loglevel for "~/.config/bpytop/error.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG". #* Set loglevel for "~/.config/bpytop/error.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
@ -2295,8 +2295,6 @@ class Collector:
'''This is meant to run in it's own thread, collecting and drawing when collect_run is set''' '''This is meant to run in it's own thread, collecting and drawing when collect_run is set'''
draw_buffers: List[str] = [] draw_buffers: List[str] = []
debugged: bool = False debugged: bool = False
clock: str = ""
clock_len: int = 0
try: try:
while not cls.stopping: while not cls.stopping:
if CONFIG.draw_clock: Box.draw_clock() if CONFIG.draw_clock: Box.draw_clock()
@ -3706,11 +3704,11 @@ def get_cpu_name() -> str:
else: else:
name = cmd_out name = cmd_out
nlist = name.split(" ") nlist = name.split(" ")
if "Xeon" in name: if "Xeon" in name and "CPU" in name:
name = nlist[nlist.index("CPU")+1] name = nlist[nlist.index("CPU")+1]
elif "Ryzen" in name: elif "Ryzen" in name:
name = " ".join(nlist[nlist.index("Ryzen"):nlist.index("Ryzen")+3]) name = " ".join(nlist[nlist.index("Ryzen"):nlist.index("Ryzen")+3])
elif "CPU" in name: elif "CPU" in name and not nlist[0] == "CPU":
name = nlist[nlist.index("CPU")-1] name = nlist[nlist.index("CPU")-1]
return name return name