removed get_sys_info func + implemented env + python info to debug

This commit is contained in:
Adnan Hodzic 2020-09-10 17:44:19 +02:00
parent dde9cd2133
commit 39a9c04f33
3 changed files with 12 additions and 42 deletions

View File

@ -10,7 +10,6 @@ from subprocess import call, run
sys.path.append('../')
from source.core import *
import click
# cli
@ -87,7 +86,7 @@ def main(monitor, live, daemon, install, log, debug):
print("Snap package: yes")
else:
print("Snap package: no")
print(get_sys_info())
python_info()
footer()
elif install:
if os.getenv('PKG_MARKER') == "SNAP":

View File

@ -21,9 +21,6 @@ parts:
build-packages:
- gcc
- python3-dev
stage-packages:
- inxi
- lm-sensors
source: .
deploy-scripts:

View File

@ -15,6 +15,8 @@ from pprint import pformat
from subprocess import getoutput, call, run
import psutil
import distro
import click
warnings.filterwarnings("ignore")
@ -62,42 +64,6 @@ def turbo(value: bool = None):
return value
def get_sys_info():
"""
Return sys info of inxi command with injected governors information
"""
govs = " ".join(get_avail_gov())
sensors = {"temperatures:": psutil.sensors_temperatures(),
"battery": psutil.sensors_battery(),
"fans": psutil.sensors_fans()}
sensors = pformat(sensors)
if shutil.which("inxi") is not None:
sys_info = getoutput("inxi -Fzc0")
f = re.MULTILINE | re.DOTALL
# remove errors at the beginning that could occur in the snap container
sys_info = re.fullmatch(r"(.*)(System:.*)", sys_info, flags=f).group(2)
# insert governors after "CPU:"
p = re.compile(pattern=r"(.*)(CPU:)(\s+)(.+)", flags=f)
indent = " " * len(p.search(sys_info).group(3))
sys_info = p.sub(fr"\1\2{indent}Governors: {govs} \4", sys_info)
# insert psutil sensors after Sensors:
p = re.compile(pattern=r"(.*)(Sensors:)(\s+)(.+)", flags=f)
indent = " " * len(p.search(sys_info).group(3))
sys_info = p.sub(fr"\1\2{indent}\n{sensors} \4", sys_info)
else:
sys_info = ("Warning: inxi is not installed.\n"
f"Governors: {govs}\n"
f"Sensors: {sensors}\n")
return sys_info
def charging():
"""
get charge state: is battery charging or discharging
@ -426,9 +392,17 @@ def mon_autofreq():
print(f"Suggesting use of \"{get_avail_powersave()}\" governor\nCurrently using:", get_current_gov())
mon_powersave()
def python_info():
print("Python:", pl.python_version())
print("psutil package:", psutil.__version__)
print("platform package:", pl.__version__)
print("click package:", click.__version__)
# workaround: Module 'distro' has no '__version__' member () (https://github.com/nir0s/distro/issues/265)
#print("distro:", distro.__version__)
run("echo \"distro package\" $(pip3 show distro | sed -n -e 's/^.*Version: //p')", shell=True)
def distro_info():
import distro
dist = "UNKNOWN distro"
version = "UNKNOWN version"