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

removed processing flag

Browse Source
This commit is contained in:
Devaev Maxim
2020-09-10 04:48:19 +03:00
parent 015baee6d7
commit 31fdcd2f3c
4 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kvmd/apps/kvmd/api/atx.py
View File

@@ -49,13 +49,13 @@ class AtxApi:
async def __power_handler(self, request: Request) -> Response:
action = valid_atx_power_action(request.query.get("action"))
wait = valid_bool(request.query.get("wait", "0"))
processing = await ({
await ({
"on": self.__atx.power_on,
"off": self.__atx.power_off,
"off_hard": self.__atx.power_off_hard,
"reset_hard": self.__atx.power_reset_hard,
}[action])(wait)
return make_json_response({"processing": processing})
return make_json_response()
@exposed_http("POST", "/atx/click")
async def __click_handler(self, request: Request) -> Response:

8
kvmd/plugins/atx/__init__.py
View File

@@ -59,16 +59,16 @@ class BaseAtx(BasePlugin):
# =====
async def power_on(self, wait: bool) -> bool:
async def power_on(self, wait: bool) -> None:
raise NotImplementedError
async def power_off(self, wait: bool) -> bool:
async def power_off(self, wait: bool) -> None:
raise NotImplementedError
async def power_off_hard(self, wait: bool) -> bool:
async def power_off_hard(self, wait: bool) -> None:
raise NotImplementedError
async def power_reset_hard(self, wait: bool) -> bool:
async def power_reset_hard(self, wait: bool) -> None:
raise NotImplementedError
# =====

10
kvmd/plugins/atx/disabled.py
View File

@@ -54,12 +54,8 @@ class Plugin(BaseAtx):
# =====
async def __stub_power(self, wait: bool) -> bool:
async def __stub(self, wait: bool) -> None:
raise AtxDisabledError()
power_on = power_off = power_off_hard = power_reset_hard = __stub_power
async def __stub_click(self, wait: bool) -> None:
raise AtxDisabledError()
click_power = click_power_long = click_reset = __stub_click
power_on = power_off = power_off_hard = power_reset_hard = __stub
click_power = click_power_long = click_reset = __stub

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

@@ -130,29 +130,21 @@ class Plugin(BaseAtx): # pylint: disable=too-many-instance-attributes
# =====
async def power_on(self, wait: bool) -> bool:
async def power_on(self, wait: bool) -> None:
if not (await self.__get_power()):
await self.click_power(wait)
return True
return False
async def power_off(self, wait: bool) -> bool:
async def power_off(self, wait: bool) -> None:
if (await self.__get_power()):
await self.click_power(wait)
return True
return False
async def power_off_hard(self, wait: bool) -> bool:
async def power_off_hard(self, wait: bool) -> None:
if (await self.__get_power()):
await self.click_power_long(wait)
return True
return False
async def power_reset_hard(self, wait: bool) -> bool:
async def power_reset_hard(self, wait: bool) -> None:
if (await self.__get_power()):
await self.click_reset(wait)
return True
return False
# =====