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

improved validation

Browse Source
This commit is contained in:
Devaev Maxim
2019-10-24 03:09:06 +03:00
parent c124e63d6d
commit b4ef91838e
4 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
kvmd/validators/basic.py
View File

@@ -36,13 +36,27 @@ from . import check_in_list
# =====
def valid_stripped_string(arg: Any, name: str="") -> str:
if not name:
name = "stripped string"
return check_not_none_string(arg, name)
def valid_stripped_string_not_empty(arg: Any, name: str="") -> str:
if not name:
name = "not empty stripped string"
if len(str(arg).strip()) == 0:
arg = None
return valid_stripped_string(arg, name)
def valid_bool(arg: Any) -> bool:
true_args = ["1", "true", "yes"]
false_args = ["0", "false", "no"]
name = f"bool ({true_args!r} or {false_args!r})"
arg = check_not_none_string(arg, name).lower()
arg = valid_stripped_string_not_empty(arg, name).lower()
arg = check_in_list(arg, name, true_args + false_args)
return (arg in true_args)
@@ -57,7 +71,7 @@ def valid_number(
name = (name or type.__name__)
arg = check_not_none_string(arg, name)
arg = valid_stripped_string_not_empty(arg, name)
try:
arg = type(arg)
except Exception: