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:
Maxim Devaev
2025-05-20 17:48:56 +03:00
parent 741e94f2fd
commit 625b2aa970
2 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
kvmd/apps/vnc/server.py
View File

@@ -29,10 +29,12 @@ import contextlib
import aiohttp
import async_lru
from evdev import ecodes
from ...logging import get_logger
from ...keyboard.keysym import build_symmap
from ...keyboard.magic import BaseMagicHandler
from ...keyboard.magic import MagicHandler
from ...clients.kvmd import KvmdClientWs
from ...clients.kvmd import KvmdClientSession
@@ -62,7 +64,7 @@ class _SharedParams:
name: str = dataclasses.field(default="PiKVM")
class _Client(RfbClient, BaseMagicHandler): # pylint: disable=too-many-instance-attributes
class _Client(RfbClient): # pylint: disable=too-many-instance-attributes
def __init__( # pylint: disable=too-many-arguments,too-many-locals
self,
reader: asyncio.StreamReader,
@@ -103,7 +105,6 @@ class _Client(RfbClient, BaseMagicHandler): # pylint: disable=too-many-instance
none_auth_only=none_auth_only,
**dataclasses.asdict(shared_params),
)
BaseMagicHandler.__init__(self)
self.__desired_fps = desired_fps
self.__mouse_output = mouse_output
@@ -130,6 +131,18 @@ class _Client(RfbClient, BaseMagicHandler): # pylint: disable=too-many-instance
self.__info_switch_units = 0
self.__info_switch_active = ""
self.__magic = MagicHandler(
proxy_handler=self.__on_magic_key_proxy,
key_handlers={
ecodes.KEY_P: self.__on_magic_clipboard_print,
ecodes.KEY_UP: self.__on_magic_switch_prev,
ecodes.KEY_LEFT: self.__on_magic_switch_prev,
ecodes.KEY_DOWN: self.__on_magic_switch_next,
ecodes.KEY_RIGHT: self.__on_magic_switch_next,
},
numeric_handler=self.__on_magic_switch_port,
)
# =====
async def run(self) -> None:
@@ -343,35 +356,36 @@ class _Client(RfbClient, BaseMagicHandler): # pylint: disable=too-many-instance
async def _on_key_event(self, key: int, state: bool) -> None:
assert self.__stage1_authorized.is_passed()
await self._magic_handle_key(key, state)
await self.__magic.handle_key(key, state)
async def _on_magic_switch_prev(self) -> None:
async def __on_magic_switch_prev(self) -> None:
assert self.__kvmd_session
if self.__info_switch_units > 0:
get_logger(0).info("%s [main]: Switching port to the previous one ...", self._remote)
await self.__kvmd_session.switch.set_active_prev()
async def _on_magic_switch_next(self) -> None:
async def __on_magic_switch_next(self) -> None:
assert self.__kvmd_session
if self.__info_switch_units > 0:
get_logger(0).info("%s [main]: Switching port to the next one ...", self._remote)
await self.__kvmd_session.switch.set_active_next()
async def _on_magic_switch_port(self, first: int, second: int) -> bool:
async def __on_magic_switch_port(self, codes: list[int]) -> bool:
assert self.__kvmd_session
assert len(codes) > 0
if self.__info_switch_units <= 0:
return True
elif 1 <= self.__info_switch_units <= 2:
port = float(first)
port = float(codes[0])
else: # self.__info_switch_units > 2:
if second < 0:
if len(codes) == 1:
return False # Wait for the second key
port = (first + 1) + (second + 1) / 10
port = (codes[0] + 1) + (codes[1] + 1) / 10
get_logger(0).info("%s [main]: Switching port to %s ...", self._remote, port)
await self.__kvmd_session.switch.set_active(port)
return True
async def _on_magic_clipboard_print(self) -> None:
async def __on_magic_clipboard_print(self) -> None:
assert self.__kvmd_session
if self.__clipboard:
logger = get_logger(0)
@@ -384,7 +398,7 @@ class _Client(RfbClient, BaseMagicHandler): # pylint: disable=too-many-instance
except Exception:
logger.exception("%s [main]: Can't print characters", self._remote)
async def _on_magic_key_proxy(self, key: int, state: bool) -> None:
async def __on_magic_key_proxy(self, key: int, state: bool) -> None:
if self.__kvmd_ws:
await self.__kvmd_ws.send_key_event(key, state)