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

changed region methods to async

Browse Source
This commit is contained in:
Devaev Maxim
2020-03-02 01:26:43 +03:00
parent e855976f05
commit 8972357dbc
5 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kvmd/plugins/atx/gpio.py
View File

@@ -162,7 +162,7 @@ class Plugin(BaseAtx): # pylint: disable=too-many-instance-attributes
@aiotools.atomic
async def __click(self, name: str, pin: int, delay: float) -> None:
with self.__region.exit_only_on_exception():
async with self.__region.exit_only_on_exception():
await self.__inner_click(name, pin, delay)
@aiotools.tasked
@@ -176,5 +176,5 @@ class Plugin(BaseAtx): # pylint: disable=too-many-instance-attributes
gpio.write(pin, False)
await asyncio.sleep(1)
finally:
self.__region.exit()
await self.__region.exit()
get_logger(0).info("Clicked ATX button %r", name)

4
kvmd/plugins/msd/otg/__init__.py
View File

@@ -114,7 +114,7 @@ class _State:
@contextlib.asynccontextmanager
async def busy(self, check_online: bool=True) -> AsyncGenerator[None, None]:
with self._region:
async with self._region:
async with self._lock:
await self.__notifier.notify()
if check_online:
@@ -304,7 +304,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
@contextlib.asynccontextmanager
async def write_image(self, name: str) -> AsyncGenerator[None, None]:
try:
with self.__state._region: # pylint: disable=protected-access
async with self.__state._region: # pylint: disable=protected-access
try:
async with self.__state._lock: # pylint: disable=protected-access
await self.__state_notifier.notify()

12
kvmd/plugins/msd/relay.py
View File

@@ -234,7 +234,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
@aiotools.atomic
async def reset(self) -> None:
with self.__region.exit_only_on_exception():
async with self.__region.exit_only_on_exception():
await self.__inner_reset()
@aiotools.tasked
@@ -254,7 +254,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
try:
gpio.write(self.__reset_pin, False)
finally:
self.__region.exit()
await self.__region.exit()
await self.__state_queue.put(await self.get_state())
@aiotools.atomic
@@ -277,7 +277,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
async with self.__working():
notify = False
try:
with self.__region:
async with self.__region:
if self.__connected:
raise MsdConnectedError()
notify = True
@@ -294,7 +294,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
async with self.__working():
notify = False
try:
with self.__region:
async with self.__region:
if not self.__connected:
raise MsdDisconnectedError()
notify = True
@@ -315,7 +315,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
@contextlib.asynccontextmanager
async def write_image(self, name: str) -> AsyncGenerator[None, None]:
async with self.__working():
self.__region.enter()
await self.__region.enter()
try:
assert self.__device_info
if self.__connected:
@@ -333,7 +333,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
await self.__close_device_file()
await self.__load_device_info()
finally:
self.__region.exit()
await self.__region.exit()
await self.__state_queue.put(await self.get_state())
async def write_image_chunk(self, chunk: bytes) -> int: