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

catch manual validation

Browse Source
This commit is contained in:
Devaev Maxim
2020-09-09 03:26:15 +03:00
parent 081797b253
commit 9c78f4f631
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kvmd/apps/__init__.py
View File

@@ -46,6 +46,7 @@ from ..plugins.msd import get_msd_class
from ..plugins.ugpio import get_ugpio_driver_class
from ..yamlconf import ConfigError
from ..yamlconf import manual_validated
from ..yamlconf import make_config
from ..yamlconf import Section
from ..yamlconf import Option
@@ -185,7 +186,8 @@ def _patch_dynamic( # pylint: disable=too-many-locals
"__gpio__": {},
**tools.rget(raw_config, "kvmd", "gpio", "drivers"),
}.items():
driver = valid_ugpio_driver(driver)
with manual_validated(driver, "kvmd", "gpio", "drivers", "<key>"):
driver = valid_ugpio_driver(driver)
driver_type = valid_stripped_string_not_empty(params.get("type", "gpio"))
scheme["kvmd"]["gpio"]["drivers"][driver] = {
"type": Option(driver_type, type=valid_stripped_string_not_empty),
@@ -194,8 +196,10 @@ def _patch_dynamic( # pylint: disable=too-many-locals
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", ""))
with manual_validated(channel, "kvmd", "gpio", "scheme", "<key>"):
channel = valid_ugpio_channel(channel)
with manual_validated(params.get("mode", ""), "kvmd", "gpio", "scheme", channel, "mode"):
mode = valid_ugpio_mode(params.get("mode", ""))
scheme["kvmd"]["gpio"]["scheme"][channel] = {
"driver": Option("__gpio__", type=(lambda arg: valid_ugpio_driver(arg, drivers))),
"pin": Option(-1, type=valid_gpio_pin),