GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-13 01:30:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Maxim Devaev 2021-07-23 20:52:47 +03:00
parent a8b3a99b97
commit 189ff59379
4 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kvmd/apps/__init__.py
View File

@ -331,10 +331,6 @@ def _dump_config(config: Section) -> None:
print(dump) print(dump)
def _make_ifarg(validator, unless): # type: ignore
return (lambda arg: (validator(arg) if arg else unless))
def _get_config_scheme() -> Dict: def _get_config_scheme() -> Dict:
return { return {
"logging": Option({}), "logging": Option({}),
@ -410,10 +406,10 @@ def _get_config_scheme() -> Dict:
"shutdown_delay": Option(10.0, type=valid_float_f01), "shutdown_delay": Option(10.0, type=valid_float_f01),
"state_poll": Option(1.0, type=valid_float_f01), "state_poll": Option(1.0, type=valid_float_f01),
"quality": Option(80, type=_make_ifarg(valid_stream_quality, 0)), "quality": Option(80, type=valid_stream_quality, if_empty=0),
"resolution": { "resolution": {
"default": Option("", type=_make_ifarg(valid_stream_resolution, ""), unpack_as="resolution"), "default": Option("", type=valid_stream_resolution, if_empty="", unpack_as="resolution"),
"available": Option( "available": Option(
[], [],
type=functools.partial(valid_string_list, subval=valid_stream_resolution), type=functools.partial(valid_string_list, subval=valid_stream_resolution),
@ -428,7 +424,7 @@ def _get_config_scheme() -> Dict:
}, },
"h264_bitrate": { "h264_bitrate": {
"default": Option(0, type=_make_ifarg(valid_stream_h264_bitrate, 0), unpack_as="h264_bitrate"), "default": Option(0, type=valid_stream_h264_bitrate, if_empty=0, unpack_as="h264_bitrate"),
"min": Option(100, type=valid_stream_h264_bitrate, unpack_as="h264_bitrate_min"), "min": Option(100, type=valid_stream_h264_bitrate, unpack_as="h264_bitrate_min"),
"max": Option(16000, type=valid_stream_h264_bitrate, unpack_as="h264_bitrate_max"), "max": Option(16000, type=valid_stream_h264_bitrate, unpack_as="h264_bitrate_max"),
}, },
@ -455,7 +451,7 @@ def _get_config_scheme() -> Dict:
"idle_interval": Option(0.0, type=valid_float_f0), "idle_interval": Option(0.0, type=valid_float_f0),
"live_interval": Option(0.0, type=valid_float_f0), "live_interval": Option(0.0, type=valid_float_f0),
"wakeup_key": Option("", type=_make_ifarg(valid_hid_key, "")), "wakeup_key": Option("", type=valid_hid_key, if_empty=""),
"wakeup_move": Option(0, type=valid_hid_mouse_move), "wakeup_move": Option(0, type=valid_hid_mouse_move),
"online_delay": Option(5.0, type=valid_float_f0), "online_delay": Option(5.0, type=valid_float_f0),
@ -509,8 +505,8 @@ def _get_config_scheme() -> Dict:
"ethernet": { "ethernet": {
"enabled": Option(False, type=valid_bool), "enabled": Option(False, type=valid_bool),
"driver": Option("ecm", type=valid_otg_ethernet), "driver": Option("ecm", type=valid_otg_ethernet),
"host_mac": Option("", type=_make_ifarg(valid_mac, "")), "host_mac": Option("", type=valid_mac, if_empty=""),
"kvm_mac": Option("", type=_make_ifarg(valid_mac, "")), "kvm_mac": Option("", type=valid_mac, if_empty=""),
}, },
"drives": { "drives": {
@ -597,7 +593,7 @@ def _get_config_scheme() -> Dict:
}, },
"sol": { "sol": {
"device": Option("", type=_make_ifarg(valid_abs_path, ""), unpack_as="sol_device_path"), "device": Option("", type=valid_abs_path, if_empty="", unpack_as="sol_device_path"),
"speed": Option(115200, type=valid_tty_speed, unpack_as="sol_speed"), "speed": Option(115200, type=valid_tty_speed, unpack_as="sol_speed"),
"select_timeout": Option(0.1, type=valid_float_f01, unpack_as="sol_select_timeout"), "select_timeout": Option(0.1, type=valid_float_f01, unpack_as="sol_select_timeout"),
"proxy_port": Option(0, type=valid_port, unpack_as="sol_proxy_port"), "proxy_port": Option(0, type=valid_port, unpack_as="sol_proxy_port"),
@ -622,11 +618,11 @@ def _get_config_scheme() -> Dict:
}, },
"tls": { "tls": {
"ciphers": Option("ALL:@SECLEVEL=0", type=_make_ifarg(valid_ssl_ciphers, "")), "ciphers": Option("ALL:@SECLEVEL=0", type=valid_ssl_ciphers, if_empty=""),
"timeout": Option(30.0, type=valid_float_f01), "timeout": Option(30.0, type=valid_float_f01),
"x509": { "x509": {
"cert": Option("", type=_make_ifarg(valid_abs_file, "")), "cert": Option("", type=valid_abs_file, if_empty=""),
"key": Option("", type=_make_ifarg(valid_abs_file, "")), "key": Option("", type=valid_abs_file, if_empty=""),
}, },
}, },
}, },

2
kvmd/plugins/msd/otg/__init__.py
View File

@ -185,7 +185,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
"unlock_cmd": Option([*sudo, "/usr/bin/kvmd-helper-otgmsd-unlock", "unlock"], type=valid_command), "unlock_cmd": Option([*sudo, "/usr/bin/kvmd-helper-otgmsd-unlock", "unlock"], type=valid_command),
"initial": { "initial": {
"image": Option("", type=(lambda arg: (valid_printable_filename(arg) if arg else ""))), "image": Option("", type=valid_printable_filename, if_empty=""),
"cdrom": Option(False, type=valid_bool), "cdrom": Option(False, type=valid_bool),
}, },
} }

5
kvmd/plugins/ugpio/wol.py
View File

@ -21,6 +21,7 @@
import socket import socket
import functools
from typing import Dict from typing import Dict
from typing import Optional from typing import Optional
@ -60,9 +61,9 @@ class Plugin(BaseUserGpioDriver): # pylint: disable=too-many-instance-attribute
@classmethod @classmethod
def get_plugin_options(cls) -> Dict: def get_plugin_options(cls) -> Dict:
return { return {
"ip": Option("255.255.255.255", type=(lambda arg: valid_ip(arg, v6=False))), "ip": Option("255.255.255.255", type=functools.partial(valid_ip, v6=False)),
"port": Option(9, type=valid_port), "port": Option(9, type=valid_port),
"mac": Option("", type=(lambda arg: (valid_mac(arg) if arg else ""))), "mac": Option("", type=valid_mac, if_empty=""),
} }
def register_input(self, pin: int, debounce: float) -> None: def register_input(self, pin: int, debounce: float) -> None:

14
kvmd/yamlconf/__init__.py
View File

@ -108,6 +108,10 @@ class Section(dict):
return dict.__getattribute__(self, key) return dict.__getattribute__(self, key)
class Stub:
pass
class Option: class Option:
__type = type __type = type
@ -115,6 +119,7 @@ class Option:
self, self,
default: Any, default: Any,
type: Optional[Callable[[Any], Any]]=None, # pylint: disable=redefined-builtin type: Optional[Callable[[Any], Any]]=None, # pylint: disable=redefined-builtin
if_empty: Any=Stub,
only_if: str="", only_if: str="",
unpack_as: str="", unpack_as: str="",
help: str="", # pylint: disable=redefined-builtin help: str="", # pylint: disable=redefined-builtin
@ -122,12 +127,16 @@ class Option:
self.default = default self.default = default
self.type: Callable[[Any], Any] = (type or (self.__type(default) if default is not None else str)) # type: ignore self.type: Callable[[Any], Any] = (type or (self.__type(default) if default is not None else str)) # type: ignore
self.if_empty = if_empty
self.only_if = only_if self.only_if = only_if
self.unpack_as = unpack_as self.unpack_as = unpack_as
self.help = help self.help = help
def __repr__(self) -> str: def __repr__(self) -> str:
return f"<Option(default={self.default}, type={self.type}, only_if={self.only_if}, unpack_as={self.unpack_as})>" return (
f"<Option(default={self.default}, type={self.type}, if_empty={self.if_empty},"
f" only_if={self.only_if}, unpack_as={self.unpack_as})>"
)
# ===== # =====
@ -170,6 +179,9 @@ def make_config(raw: Dict[str, Any], scheme: Dict[str, Any], _keys: Tuple[str, .
value = option.default value = option.default
else: else:
value = raw.get(key, option.default) value = raw.get(key, option.default)
if option.if_empty != Stub and not value:
value = option.if_empty
else:
try: try:
value = option.type(value) value = option.type(value)
except (TypeError, ValueError) as err: except (TypeError, ValueError) as err: