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

refactoring

Browse Source
This commit is contained in:
Devaev Maxim
2020-09-08 12:32:16 +03:00
parent d932a937ca
commit d528a3002e
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kvmd/apps/__init__.py
View File

@@ -29,6 +29,7 @@ import logging.config
from typing import Tuple
from typing import List
from typing import Dict
from typing import Set
from typing import Optional
import pygments
@@ -52,8 +53,6 @@ from ..yamlconf import build_raw_from_options
from ..yamlconf.dumper import make_config_dump
from ..yamlconf.loader import load_yaml_file
from ..validators import check_string_in_list
from ..validators.basic import valid_stripped_string
from ..validators.basic import valid_stripped_string_not_empty
from ..validators.basic import valid_bool
@@ -181,7 +180,7 @@ def _patch_dynamic( # pylint: disable=too-many-locals
rebuild = True
if load_gpio:
drivers: List[str] = []
drivers: Set[str] = set()
for (driver, params) in { # type: ignore
"__gpio__": {},
**tools.rget(raw_config, "kvmd", "gpio", "drivers"),
@@ -192,17 +191,13 @@ def _patch_dynamic( # pylint: disable=too-many-locals
"type": Option(driver_type, type=valid_stripped_string_not_empty),
**get_ugpio_driver_class(driver_type).get_plugin_options()
}
drivers.append(driver)
drivers.add(driver)
for (channel, params) in tools.rget(raw_config, "kvmd", "gpio", "scheme").items():
channel = valid_ugpio_channel(channel)
mode = valid_ugpio_mode(params.get("mode", ""))
scheme["kvmd"]["gpio"]["scheme"][channel] = {
"driver": Option("__gpio__", type=(lambda arg: check_string_in_list(
arg=valid_stripped_string_not_empty(arg),
name="configured GPIO driver",
variants=drivers,
))),
"driver": Option("__gpio__", type=(lambda arg: valid_ugpio_driver(arg, drivers))),
"pin": Option(-1, type=valid_gpio_pin),
"mode": Option("", type=valid_ugpio_mode),
"inverted": Option(False, type=valid_bool),