GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 00:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

pikvm/pikvm#1342: Verbose platform info in /api/info

Browse Source
This commit is contained in:
Maxim Devaev
2024-07-27 14:07:26 +03:00
parent 6a665cd62f
commit 7e42d32007
5 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kvmd/apps/__init__.py
View File

@@ -382,6 +382,7 @@ def _get_config_scheme() -> dict:
"meta": Option("/etc/kvmd/meta.yaml", type=valid_abs_file),
"extras": Option("/usr/share/kvmd/extras", type=valid_abs_dir),
"hw": {
"platform": Option("/usr/share/kvmd/platform", type=valid_abs_file, unpack_as="platform_path"),
"vcgencmd_cmd": Option(["/usr/bin/vcgencmd"], type=valid_command),
"ignore_past": Option(False, type=valid_bool),
"state_poll": Option(5.0, type=valid_float_f01),

29
kvmd/apps/kvmd/info/hw.py
View File

@@ -47,11 +47,13 @@ _RetvalT = TypeVar("_RetvalT")
class HwInfoSubmanager(BaseInfoSubmanager):
def __init__(
self,
platform_path: str,
vcgencmd_cmd: list[str],
ignore_past: bool,
state_poll: float,
) -> None:
self.__platform_path = platform_path
self.__vcgencmd_cmd = vcgencmd_cmd
self.__ignore_past = ignore_past
self.__state_poll = state_poll
@@ -60,12 +62,16 @@ class HwInfoSubmanager(BaseInfoSubmanager):
async def get_state(self) -> dict:
(
model, serial, throttling,
cpu_percent, cpu_temp,
base, serial,
(model, video, board),
throttling,
cpu_percent,
cpu_temp,
(mem_percent, mem_total, mem_available),
) = await asyncio.gather(
self.__read_dt_file("model"),
self.__read_dt_file("serial-number"),
self.__read_platform_file(),
self.__get_throttling(),
self.__get_cpu_percent(),
self.__get_cpu_temp(),
@@ -74,8 +80,11 @@ class HwInfoSubmanager(BaseInfoSubmanager):
return {
"platform": {
"type": "rpi",
"base": model,
"base": base,
"serial": serial,
"model": model,
"video": video,
"board": board,
},
"health": {
"temp": {
@@ -114,6 +123,20 @@ class HwInfoSubmanager(BaseInfoSubmanager):
return None
return self.__dt_cache[name]
async def __read_platform_file(self) -> tuple[(str | None), (str | None), (str | None)]:
try:
text = await aiotools.read_file(self.__platform_path)
parsed: dict[str, str] = {}
for row in text.split("\n"):
row = row.strip()
if row:
(key, value) = row.split("=", 1)
parsed[key.strip()] = value.strip()
return (parsed["PIKVM_MODEL"], parsed["PIKVM_VIDEO"], parsed["PIKVM_BOARD"])
except Exception:
get_logger(0).exception("Can't read device model")
return (None, None, None)
async def __get_cpu_temp(self) -> (float | None):
temp_path = f"{env.SYSFS_PREFIX}/sys/class/thermal/thermal_zone0/temp"
try: