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 2019-04-07 09:11:03 +03:00
parent 6c121bf87f
commit 2e67f5b3b5
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kvmd/apps/kvmd/server.py
View File

@ -36,6 +36,7 @@ from typing import Set
from typing import Callable from typing import Callable
from typing import Optional from typing import Optional
import aiohttp
import aiohttp.web import aiohttp.web
import setproctitle import setproctitle
@ -129,6 +130,13 @@ def _json_exception(err: Exception, status: int) -> aiohttp.web.Response:
}, status=status) }, status=status)
async def _get_multipart_field(reader: aiohttp.MultipartReader, name: str) -> aiohttp.BodyPartReader:
field = await reader.next()
if not field or field.name != name:
raise ValidatorError("Missing %r field" % (name))
return field
_ATTR_EXPOSED = "exposed" _ATTR_EXPOSED = "exposed"
_ATTR_EXPOSED_METHOD = "exposed_method" _ATTR_EXPOSED_METHOD = "exposed_method"
_ATTR_EXPOSED_PATH = "exposed_path" _ATTR_EXPOSED_PATH = "exposed_path"
@ -450,19 +458,15 @@ class Server: # pylint: disable=too-many-instance-attributes
written = 0 written = 0
try: try:
async with self.__msd: async with self.__msd:
field = await reader.next() name_field = await _get_multipart_field(reader, "image_name")
if not field or field.name != "image_name": image_name = (await name_field.read()).decode("utf-8")[:256]
raise ValidatorError("Missing 'image_name' field")
image_name = (await field.read()).decode("utf-8")[:256]
field = await reader.next() data_field = await _get_multipart_field(reader, "image_data")
if not field or field.name != "image_data":
raise ValidatorError("Missing 'image_data' field")
logger.info("Writing image %r to mass-storage device ...", image_name) logger.info("Writing image %r to mass-storage device ...", image_name)
await self.__msd.write_image_info(image_name, False) await self.__msd.write_image_info(image_name, False)
while True: while True:
chunk = await field.read_chunk(self.__msd.chunk_size) chunk = await data_field.read_chunk(self.__msd.chunk_size)
if not chunk: if not chunk:
break break
written = await self.__msd.write_image_chunk(chunk) written = await self.__msd.write_image_chunk(chunk)