From 6a8ee1a11470fe6572c0ca224ec370f2b4752be0 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Sun, 22 Nov 2020 04:54:03 +0300 Subject: refactoring --- kvmd/validators/hid.py | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ kvmd/validators/kvm.py | 29 -------------------------- 2 files changed, 56 insertions(+), 29 deletions(-) create mode 100644 kvmd/validators/hid.py (limited to 'kvmd/validators') diff --git a/kvmd/validators/hid.py b/kvmd/validators/hid.py new file mode 100644 index 00000000..4f6ca4be --- /dev/null +++ b/kvmd/validators/hid.py @@ -0,0 +1,56 @@ +# ========================================================================== # +# # +# KVMD - The main Pi-KVM daemon. # +# # +# Copyright (C) 2018 Maxim Devaev # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +# ========================================================================== # + + +from typing import Any + +from ..keyboard.mappings import KEYMAP + +from . import check_string_in_list + +from .basic import valid_number + + +# ===== +def valid_hid_keyboard_output(arg: Any) -> str: + return check_string_in_list(arg, "Keyboard output", ["usb", "ps2", ""]) + + +def valid_hid_mouse_output(arg: Any) -> str: + return check_string_in_list(arg, "Mouse output", ["usb", "usb_rel", "ps2", ""]) + + +def valid_hid_key(arg: Any) -> str: + return check_string_in_list(arg, "Keyboard key", KEYMAP, lower=False) + + +def valid_hid_mouse_move(arg: Any) -> int: + arg = valid_number(arg, name="Mouse move") + return min(max(-32768, arg), 32767) + + +def valid_hid_mouse_button(arg: Any) -> str: + return check_string_in_list(arg, "Mouse button", ["left", "right", "middle", "up", "down"]) + + +def valid_hid_mouse_delta(arg: Any) -> int: + arg = valid_number(arg, name="Mouse delta") + return min(max(-127, arg), 127) diff --git a/kvmd/validators/kvm.py b/kvmd/validators/kvm.py index 1122c233..16f8e59b 100644 --- a/kvmd/validators/kvm.py +++ b/kvmd/validators/kvm.py @@ -25,8 +25,6 @@ from typing import Set from typing import Optional from typing import Any -from ..keyboard.mappings import KEYMAP - from . import raise_error from . import check_string_in_list from . import check_re_match @@ -82,33 +80,6 @@ def valid_stream_resolution(arg: Any) -> str: return f"{width}x{height}" -# ===== -def valid_hid_keyboard_output(arg: Any) -> str: - return check_string_in_list(arg, "Keyboard output", ["usb", "ps2", ""]) - - -def valid_hid_mouse_output(arg: Any) -> str: - return check_string_in_list(arg, "Mouse output", ["usb", "usb_rel", "ps2", ""]) - - -def valid_hid_key(arg: Any) -> str: - return check_string_in_list(arg, "HID key", KEYMAP, lower=False) - - -def valid_hid_mouse_move(arg: Any) -> int: - arg = valid_number(arg, name="HID mouse move") - return min(max(-32768, arg), 32767) - - -def valid_hid_mouse_button(arg: Any) -> str: - return check_string_in_list(arg, "HID mouse button", ["left", "right", "middle", "up", "down"]) - - -def valid_hid_mouse_delta(arg: Any) -> int: - arg = valid_number(arg, name="HID mouse delta") - return min(max(-127, arg), 127) - - # ===== def valid_ugpio_driver(arg: Any, variants: Optional[Set[str]]=None) -> str: name = "GPIO driver" -- cgit v1.2.3