GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-31 18:11:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactored msd writer api

Browse Source
This commit is contained in:
Maxim Devaev
2022-08-04 04:04:10 +03:00
parent 9925198762
commit 9ee63aba3e
6 changed files with 66 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ from .. import MsdUnknownImageError
from .. import MsdImageExistsError
from .. import BaseMsd
from .. import MsdFileReader
from .. import MsdImageWriter
from .. import MsdFileWriter
from . import fs
@@ -166,7 +166,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
self.__drive = Drive(gadget, instance=0, lun=0)
self.__reader: Optional[MsdFileReader] = None
self.__writer: Optional[MsdImageWriter] = None
self.__writer: Optional[MsdFileWriter] = None
self.__notifier = aiotools.AioNotifier()
self.__state = _State(self.__notifier)
@@ -359,7 +359,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
await self.__notifier.notify()
@contextlib.asynccontextmanager
async def write_image(self, name: str, size: int, remove_incomplete: Optional[bool]) -> AsyncGenerator[int, None]:
async def write_image(self, name: str, size: int, remove_incomplete: Optional[bool]) -> AsyncGenerator[MsdFileWriter, None]:
try:
async with self.__state._region: # pylint: disable=protected-access
path: str = ""
@@ -379,15 +379,16 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
await self.__remount_rw(True)
self.__set_image_complete(name, False)
self.__writer = await MsdImageWriter(
self.__writer = await MsdFileWriter(
notifier=self.__notifier,
path=path,
size=size,
sync=self.__sync_chunk_size,
file_size=size,
sync_size=self.__sync_chunk_size,
chunk_size=self.__write_chunk_size,
).open()
await self.__notifier.notify()
yield self.__write_chunk_size
yield self.__writer
self.__set_image_complete(name, self.__writer.is_complete())
finally:
@@ -405,10 +406,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
await self.__reload_state()
await self.__notifier.notify()
async def write_image_chunk(self, chunk: bytes) -> int:
assert self.__writer
return (await self.__writer.write(chunk))
@aiotools.atomic
async def remove(self, name: str) -> None:
async with self.__state.busy():