GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 01:00:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Devaev Maxim 2018-07-02 11:10:30 +03:00
parent 54faa8ab7e
commit 87f8cb350b
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kvmd/kvmd/msd.py
View File

@ -22,27 +22,27 @@ class MassStorageError(Exception):
pass pass
class MassStorageIsNotOperationalError(MassStorageError): class IsNotOperationalError(MassStorageError):
def __init__(self) -> None: def __init__(self) -> None:
super().__init__("Missing bind for mass-storage device") super().__init__("Missing bind for mass-storage device")
class MassStorageAlreadyConnectedToPcError(MassStorageError): class AlreadyConnectedToPcError(MassStorageError):
def __init__(self) -> None: def __init__(self) -> None:
super().__init__("Mass-storage is already connected to PC") super().__init__("Mass-storage is already connected to PC")
class MassStorageAlreadyConnectedToKvmError(MassStorageError): class AlreadyConnectedToKvmError(MassStorageError):
def __init__(self) -> None: def __init__(self) -> None:
super().__init__("Mass-storage is already connected to KVM") super().__init__("Mass-storage is already connected to KVM")
class MassStorageIsNotConnectedToKvmError(MassStorageError): class IsNotConnectedToKvmError(MassStorageError):
def __init__(self) -> None: def __init__(self) -> None:
super().__init__("Mass-storage is not connected to KVM") super().__init__("Mass-storage is not connected to KVM")
class MassStorageIsBusyError(MassStorageError): class IsBusyError(MassStorageError):
def __init__(self) -> None: def __init__(self) -> None:
super().__init__("Mass-storage is busy (write in progress)") super().__init__("Mass-storage is busy (write in progress)")
@ -95,9 +95,9 @@ def locate_by_bind(bind: str) -> str:
def _operated_and_locked(method: Callable) -> Callable: def _operated_and_locked(method: Callable) -> Callable:
async def wrap(self: "MassStorageDevice", *args: Any, **kwargs: Any) -> Any: async def wrap(self: "MassStorageDevice", *args: Any, **kwargs: Any) -> Any:
if self._device_file: # pylint: disable=protected-access if self._device_file: # pylint: disable=protected-access
raise MassStorageIsBusyError() raise IsBusyError()
if not self._bind: # pylint: disable=protected-access if not self._bind: # pylint: disable=protected-access
MassStorageIsNotOperationalError() IsNotOperationalError()
async with self._lock: # pylint: disable=protected-access async with self._lock: # pylint: disable=protected-access
return (await method(self, *args, **kwargs)) return (await method(self, *args, **kwargs))
return wrap return wrap
@ -127,7 +127,7 @@ class MassStorageDevice:
@_operated_and_locked @_operated_and_locked
async def connect_to_kvm(self, no_delay: bool=False) -> None: async def connect_to_kvm(self, no_delay: bool=False) -> None:
if self.__device_info: if self.__device_info:
raise MassStorageAlreadyConnectedToKvmError() raise AlreadyConnectedToKvmError()
# TODO: disable gpio # TODO: disable gpio
if not no_delay: if not no_delay:
await asyncio.sleep(self.__init_delay) await asyncio.sleep(self.__init_delay)
@ -140,7 +140,7 @@ class MassStorageDevice:
@_operated_and_locked @_operated_and_locked
async def connect_to_pc(self) -> None: async def connect_to_pc(self) -> None:
if not self.__device_info: if not self.__device_info:
raise MassStorageAlreadyConnectedToPcError() raise AlreadyConnectedToPcError()
# TODO: enable gpio # TODO: enable gpio
self.__device_info = None self.__device_info = None
get_logger().info("Mass-storage device switched to PC") get_logger().info("Mass-storage device switched to PC")
@ -156,13 +156,13 @@ class MassStorageDevice:
async def cleanup(self) -> None: async def cleanup(self) -> None:
async with self._lock: async with self._lock:
await self.__close_file() await self.__close_device_file()
# TODO: disable gpio # TODO: disable gpio
@_operated_and_locked @_operated_and_locked
async def __aenter__(self) -> "MassStorageDevice": async def __aenter__(self) -> "MassStorageDevice":
if not self.__device_info: if not self.__device_info:
raise MassStorageIsNotConnectedToKvmError() raise IsNotConnectedToKvmError()
self._device_file = await aiofiles.open(self.__device_info.path, mode="wb", buffering=0) self._device_file = await aiofiles.open(self.__device_info.path, mode="wb", buffering=0)
self.__writed = 0 self.__writed = 0
return self return self
@ -184,9 +184,9 @@ class MassStorageDevice:
_tb: types.TracebackType, _tb: types.TracebackType,
) -> None: ) -> None:
async with self._lock: async with self._lock:
await self.__close_file() await self.__close_device_file()
async def __close_file(self) -> None: async def __close_device_file(self) -> None:
try: try:
if self._device_file: if self._device_file:
get_logger().info("Closing device file ...") get_logger().info("Closing device file ...")