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

msd ui

Browse Source
This commit is contained in:
Devaev Maxim
2018-07-21 08:36:44 +03:00
parent a4f4d281b2
commit ad8fb657ad
7 changed files with 342 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kvmd/kvmd/msd.py
View File

@@ -176,6 +176,7 @@ class MassStorageDevice: # pylint: disable=too-many-instance-attributes
self.__loop = loop
self.__device_info: Optional[_MassStorageDeviceInfo] = None
self.__saved_device_info: Optional[_MassStorageDeviceInfo] = None
self.__region = aioregion.AioExclusiveRegion(MsdIsBusyError)
self.__device_file: Optional[aiofiles.base.AiofilesContextManager] = None
self.__written = 0
@@ -217,7 +218,7 @@ class MassStorageDevice: # pylint: disable=too-many-instance-attributes
get_logger().info("Mass-storage device switched to Server")
def get_state(self) -> Dict:
info = (self.__device_info._asdict() if self.__device_info else None)
info = (self.__saved_device_info._asdict() if self.__saved_device_info else None)
if info:
info["hw"] = (info["hw"]._asdict() if info["hw"] else None)
info["image"] = (info["image"]._asdict() if info["image"] else None)
@@ -283,7 +284,7 @@ class MassStorageDevice: # pylint: disable=too-many-instance-attributes
device_info = await self.__loop.run_in_executor(None, _explore_device, self._device_path)
if not device_info:
raise MsdError("Can't explore device %r" % (self._device_path))
self.__device_info = device_info
self.__device_info = self.__saved_device_info = device_info
async def __close_device_file(self) -> None:
try:

12
kvmd/kvmd/server.py
View File

@@ -40,10 +40,14 @@ def _system_task(method: Callable) -> Callable:
def _json(result: Optional[Dict]=None, status: int=200) -> aiohttp.web.Response:
return aiohttp.web.json_response({
"ok": (True if status == 200 else False),
"result": (result or {}),
}, status=status)
return aiohttp.web.Response(
text=json.dumps({
"ok": (True if status == 200 else False),
"result": (result or {}),
}, sort_keys=True, indent=4),
status=status,
content_type="application/json",
)
def _json_exception(msg: str, err: Exception, status: int) -> aiohttp.web.Response: