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 2021-01-25 18:33:41 +03:00
parent 3360a3fce6
commit a0ae387a6c
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
kvmd/clients/streamer.py
View File

@ -59,21 +59,6 @@ class BaseStreamerClient:
yield yield
# =====
def _patch_stream_reader(reader: aiohttp.StreamReader) -> None:
# https://github.com/pikvm/pikvm/issues/92
# Infinite looping in BodyPartReader.read() because _at_eof flag.
orig_read = reader.read
async def read(self: aiohttp.StreamReader, n: int=-1) -> bytes: # pylint: disable=invalid-name
if self.is_eof():
raise StreamerTempError("StreamReader.read(): Reached EOF")
return (await orig_read(n))
reader.read = types.MethodType(read, reader) # type: ignore
class StreamerHttpClient(BaseStreamerClient): class StreamerHttpClient(BaseStreamerClient):
def __init__( def __init__(
self, self,
@ -102,7 +87,7 @@ class StreamerHttpClient(BaseStreamerClient):
) as response: ) as response:
htclient.raise_not_200(response) htclient.raise_not_200(response)
reader = aiohttp.MultipartReader.from_response(response) reader = aiohttp.MultipartReader.from_response(response)
_patch_stream_reader(reader.resp.content) self.__patch_stream_reader(reader.resp.content)
while True: while True:
frame = await reader.next() # pylint: disable=not-callable frame = await reader.next() # pylint: disable=not-callable
@ -142,6 +127,19 @@ class StreamerHttpClient(BaseStreamerClient):
assert not handle.startswith("/"), handle assert not handle.startswith("/"), handle
return f"http://{self.__host}:{self.__port}/{handle}" return f"http://{self.__host}:{self.__port}/{handle}"
def __patch_stream_reader(self, reader: aiohttp.StreamReader) -> None:
# https://github.com/pikvm/pikvm/issues/92
# Infinite looping in BodyPartReader.read() because _at_eof flag.
orig_read = reader.read
async def read(self: aiohttp.StreamReader, n: int=-1) -> bytes: # pylint: disable=invalid-name
if self.is_eof():
raise StreamerTempError("StreamReader.read(): Reached EOF")
return (await orig_read(n))
reader.read = types.MethodType(read, reader) # type: ignore
def __str__(self) -> str: def __str__(self) -> str:
return f"StreamerHttpClient({self.__name})" return f"StreamerHttpClient({self.__name})"