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

refactoring

Browse Source
This commit is contained in:
Devaev Maxim
2020-05-29 04:33:35 +03:00
parent eb13da03be
commit cf5bf8e147
4 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ from ....validators.os import valid_abs_dir
from ....validators.os import valid_command
from .... import aiotools
from .... import aiofs
from .. import MsdError
from .. import MsdIsBusyError
@@ -340,7 +341,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
async def write_image_chunk(self, chunk: bytes) -> int:
assert self.__new_file
await aiotools.afile_write_now(self.__new_file, chunk)
await aiofs.afile_write_now(self.__new_file, chunk)
self.__new_file_written += len(chunk)
now = time.time()
if self.__new_file_tick + 1 < now:

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

@@ -39,6 +39,7 @@ import aiofiles.base
from ...logging import get_logger
from ... import aiotools
from ... import aiofs
from ... import gpio
from ...yamlconf import Option
@@ -325,7 +326,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
async def write_image_chunk(self, chunk: bytes) -> int:
assert self.__device_file
await aiotools.afile_write_now(self.__device_file, chunk)
await aiofs.afile_write_now(self.__device_file, chunk)
self.__written += len(chunk)
return self.__written
@@ -349,7 +350,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
assert self.__device_info
if self.__device_info.size - self.__written > _IMAGE_INFO_SIZE:
await self.__device_file.seek(self.__device_info.size - _IMAGE_INFO_SIZE)
await aiotools.afile_write_now(self.__device_file, _make_image_info_bytes(name, self.__written, complete))
await aiofs.afile_write_now(self.__device_file, _make_image_info_bytes(name, self.__written, complete))
await self.__device_file.seek(0)
else:
get_logger().error("Can't write image info because device is full")