From 49a1beab37741d53a1c37f2b5c9124788fe0b3f0 Mon Sep 17 00:00:00 2001 From: Maxim Devaev Date: Mon, 6 Mar 2023 19:29:06 +0200 Subject: [PATCH] explicit image name --- kvmd/plugins/msd/__init__.py | 8 ++++---- kvmd/plugins/msd/otg/__init__.py | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kvmd/plugins/msd/__init__.py b/kvmd/plugins/msd/__init__.py index e0fc856e..34efaafe 100644 --- a/kvmd/plugins/msd/__init__.py +++ b/kvmd/plugins/msd/__init__.py @@ -163,9 +163,9 @@ class BaseMsd(BasePlugin): class MsdFileReader(BaseMsdReader): # pylint: disable=too-many-instance-attributes - def __init__(self, notifier: aiotools.AioNotifier, path: str, chunk_size: int) -> None: + def __init__(self, notifier: aiotools.AioNotifier, name: str, path: str, chunk_size: int) -> None: self.__notifier = notifier - self.__name = os.path.basename(path) + self.__name = name self.__path = path self.__chunk_size = chunk_size @@ -222,9 +222,9 @@ class MsdFileReader(BaseMsdReader): # pylint: disable=too-many-instance-attribu class MsdFileWriter(BaseMsdWriter): # pylint: disable=too-many-instance-attributes - def __init__(self, notifier: aiotools.AioNotifier, path: str, file_size: int, sync_size: int, chunk_size: int) -> None: + def __init__(self, notifier: aiotools.AioNotifier, name: str, path: str, file_size: int, sync_size: int, chunk_size: int) -> None: self.__notifier = notifier - self.__name = os.path.basename(path) + self.__name = name self.__path = path self.__file_size = file_size self.__sync_size = sync_size diff --git a/kvmd/plugins/msd/otg/__init__.py b/kvmd/plugins/msd/otg/__init__.py index 4155a89e..d1a9dc6a 100644 --- a/kvmd/plugins/msd/otg/__init__.py +++ b/kvmd/plugins/msd/otg/__init__.py @@ -307,6 +307,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes image = self.__STATE_get_storage_image(name) self.__reader = await MsdFileReader( notifier=self.__notifier, + name=image.name, path=image.path, chunk_size=self.__read_chunk_size, ).open() @@ -332,6 +333,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes self.__writer = await MsdFileWriter( notifier=self.__notifier, + name=image.name, path=image.path, file_size=size, sync_size=self.__sync_chunk_size,