refactoring

This commit is contained in:
Devaev Maxim 2020-09-30 14:12:09 +03:00
parent eeedb6025a
commit 16946d1e0f
18 changed files with 62 additions and 21 deletions

View File

@ -26,7 +26,6 @@ from aiohttp.web import Response
from ....plugins.atx import BaseAtx from ....plugins.atx import BaseAtx
from ....validators.basic import valid_bool from ....validators.basic import valid_bool
from ....validators.kvm import valid_atx_power_action from ....validators.kvm import valid_atx_power_action
from ....validators.kvm import valid_atx_button from ....validators.kvm import valid_atx_button

View File

@ -31,7 +31,6 @@ from aiohttp.web import Response
from .... import tools from .... import tools
from ....plugins.atx import BaseAtx from ....plugins.atx import BaseAtx
from ....plugins.ugpio import UserGpioModes from ....plugins.ugpio import UserGpioModes
from ..info import InfoManager from ..info import InfoManager

View File

@ -34,12 +34,9 @@ from aiohttp.web import WebSocketResponse
from ....plugins.hid import BaseHid from ....plugins.hid import BaseHid
from ....validators import raise_error from ....validators import raise_error
from ....validators.basic import valid_bool from ....validators.basic import valid_bool
from ....validators.basic import valid_int_f0 from ....validators.basic import valid_int_f0
from ....validators.os import valid_printable_filename from ....validators.os import valid_printable_filename
from ....validators.kvm import valid_hid_key from ....validators.kvm import valid_hid_key
from ....validators.kvm import valid_hid_mouse_move from ....validators.kvm import valid_hid_mouse_move
from ....validators.kvm import valid_hid_mouse_button from ....validators.kvm import valid_hid_mouse_button
@ -47,7 +44,6 @@ from ....validators.kvm import valid_hid_mouse_wheel
from ....keyboard.keysym import SymmapWebKey from ....keyboard.keysym import SymmapWebKey
from ....keyboard.keysym import build_symmap from ....keyboard.keysym import build_symmap
from ....keyboard.printer import text_to_web_keys from ....keyboard.printer import text_to_web_keys
from ..http import exposed_http from ..http import exposed_http

View File

@ -24,7 +24,6 @@ from aiohttp.web import Request
from aiohttp.web import StreamResponse from aiohttp.web import StreamResponse
from ....validators.basic import valid_bool from ....validators.basic import valid_bool
from ....validators.kvm import valid_log_seek from ....validators.kvm import valid_log_seek
from ..logreader import LogReader from ..logreader import LogReader

View File

@ -28,7 +28,6 @@ from ....logging import get_logger
from ....plugins.msd import BaseMsd from ....plugins.msd import BaseMsd
from ....validators.basic import valid_bool from ....validators.basic import valid_bool
from ....validators.kvm import valid_msd_image_name from ....validators.kvm import valid_msd_image_name
from ..http import exposed_http from ..http import exposed_http

View File

@ -30,7 +30,6 @@ from PIL import Image
from ....validators.basic import valid_bool from ....validators.basic import valid_bool
from ....validators.basic import valid_int_f0 from ....validators.basic import valid_int_f0
from ....validators.kvm import valid_stream_quality from ....validators.kvm import valid_stream_quality
from .... import aiotools from .... import aiotools

View File

@ -25,7 +25,6 @@ from aiohttp.web import Response
from ....validators.basic import valid_bool from ....validators.basic import valid_bool
from ....validators.basic import valid_float_f0 from ....validators.basic import valid_float_f0
from ....validators.kvm import valid_ugpio_channel from ....validators.kvm import valid_ugpio_channel
from ..ugpio import UserGpio from ..ugpio import UserGpio

View File

@ -1,3 +1,25 @@
# ========================================================================== #
# #
# KVMD - The main Pi-KVM daemon. #
# #
# Copyright (C) 2018 Maxim Devaev <mdevaev@gmail.com> #
# #
# 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 <https://www.gnu.org/licenses/>. #
# #
# ========================================================================== #
import os import os
import socket import socket
import dataclasses import dataclasses

View File

@ -51,9 +51,7 @@ from ...plugins.atx import BaseAtx
from ...plugins.msd import BaseMsd from ...plugins.msd import BaseMsd
from ...validators import ValidatorError from ...validators import ValidatorError
from ...validators.basic import valid_bool from ...validators.basic import valid_bool
from ...validators.kvm import valid_stream_quality from ...validators.kvm import valid_stream_quality
from ...validators.kvm import valid_stream_fps from ...validators.kvm import valid_stream_fps
from ...validators.kvm import valid_stream_resolution from ...validators.kvm import valid_stream_resolution

View File

@ -32,7 +32,6 @@ import psutil
from ...validators.basic import valid_bool from ...validators.basic import valid_bool
from ...validators.basic import valid_int_f0 from ...validators.basic import valid_int_f0
from ...validators.os import valid_abs_file from ...validators.os import valid_abs_file
from .. import init from .. import init

View File

@ -0,0 +1,20 @@
# ========================================================================== #
# #
# KVMD - The main Pi-KVM daemon. #
# #
# Copyright (C) 2018 Maxim Devaev <mdevaev@gmail.com> #
# #
# 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 <https://www.gnu.org/licenses/>. #
# #
# ========================================================================== #

View File

@ -0,0 +1,20 @@
# ========================================================================== #
# #
# KVMD - The main Pi-KVM daemon. #
# #
# Copyright (C) 2018 Maxim Devaev <mdevaev@gmail.com> #
# #
# 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 <https://www.gnu.org/licenses/>. #
# #
# ========================================================================== #

View File

@ -36,7 +36,6 @@ from ...yamlconf import Option
from ...validators.basic import valid_bool from ...validators.basic import valid_bool
from ...validators.basic import valid_float_f0 from ...validators.basic import valid_float_f0
from ...validators.basic import valid_float_f01 from ...validators.basic import valid_float_f01
from ...validators.hw import valid_gpio_pin from ...validators.hw import valid_gpio_pin
from . import AtxIsBusyError from . import AtxIsBusyError

View File

@ -33,7 +33,6 @@ from ....yamlconf import Option
from ....validators.basic import valid_bool from ....validators.basic import valid_bool
from ....validators.basic import valid_int_f1 from ....validators.basic import valid_int_f1
from ....validators.basic import valid_float_f01 from ....validators.basic import valid_float_f01
from ....validators.os import valid_abs_path from ....validators.os import valid_abs_path
from .. import BaseHid from .. import BaseHid

View File

@ -54,9 +54,7 @@ from ...validators.basic import valid_bool
from ...validators.basic import valid_int_f0 from ...validators.basic import valid_int_f0
from ...validators.basic import valid_int_f1 from ...validators.basic import valid_int_f1
from ...validators.basic import valid_float_f01 from ...validators.basic import valid_float_f01
from ...validators.os import valid_abs_path from ...validators.os import valid_abs_path
from ...validators.hw import valid_tty_speed from ...validators.hw import valid_tty_speed
from ...validators.hw import valid_gpio_pin_optional from ...validators.hw import valid_gpio_pin_optional

View File

@ -47,9 +47,7 @@ from ...yamlconf import Option
from ...validators.basic import valid_int_f1 from ...validators.basic import valid_int_f1
from ...validators.basic import valid_float_f01 from ...validators.basic import valid_float_f01
from ...validators.os import valid_abs_path from ...validators.os import valid_abs_path
from ...validators.hw import valid_gpio_pin from ...validators.hw import valid_gpio_pin
from . import MsdError from . import MsdError

View File

@ -36,7 +36,6 @@ from ... import aiotools
from ...yamlconf import Option from ...yamlconf import Option
from ...validators.basic import valid_float_f01 from ...validators.basic import valid_float_f01
from ...validators.os import valid_abs_path from ...validators.os import valid_abs_path
from . import GpioDriverOfflineError from . import GpioDriverOfflineError

View File

@ -35,7 +35,6 @@ from . import check_len
from .basic import valid_stripped_string_not_empty from .basic import valid_stripped_string_not_empty
from .basic import valid_number from .basic import valid_number
from .basic import valid_string_list from .basic import valid_string_list
from .os import valid_printable_filename from .os import valid_printable_filename