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

refactored msd reader api

Browse Source
This commit is contained in:
Maxim Devaev
2022-08-03 19:44:08 +03:00
parent 0809daa199
commit 9925198762
5 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ from .. import MsdImageNotSelected
from .. import MsdUnknownImageError
from .. import MsdImageExistsError
from .. import BaseMsd
from .. import MsdImageReader
from .. import MsdFileReader
from .. import MsdImageWriter
from . import fs
@@ -165,7 +165,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
self.__drive = Drive(gadget, instance=0, lun=0)
self.__reader: Optional[MsdImageReader] = None
self.__reader: Optional[MsdFileReader] = None
self.__writer: Optional[MsdImageWriter] = None
self.__notifier = aiotools.AioNotifier()
@@ -329,7 +329,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
self.__state.vd.connected = connected
@contextlib.asynccontextmanager
async def read_image(self, name: str) -> AsyncGenerator[int, None]:
async def read_image(self, name: str) -> AsyncGenerator[MsdFileReader, None]:
try:
async with self.__state._region: # pylint: disable=protected-access
try:
@@ -345,23 +345,19 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
if name not in self.__state.storage.images or not os.path.exists(path):
raise MsdUnknownImageError()
self.__reader = await MsdImageReader(
self.__reader = await MsdFileReader(
notifier=self.__notifier,
path=path,
chunk_size=self.__read_chunk_size,
).open()
yield self.__reader.get_size()
yield self.__reader
finally:
await self.__close_reader()
finally:
await self.__notifier.notify()
async def read_image_chunk(self) -> bytes:
assert self.__reader
return (await self.__reader.read())
@contextlib.asynccontextmanager
async def write_image(self, name: str, size: int, remove_incomplete: Optional[bool]) -> AsyncGenerator[int, None]:
try: