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

refactoring

Browse Source
This commit is contained in:
Maxim Devaev
2022-07-23 05:02:53 +03:00
parent 2eef9bd263
commit aa5a538c64
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -328,7 +328,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
if name in self.__state.storage.images or os.path.exists(path): if name in self.__state.storage.images or os.path.exists(path):
raise MsdImageExistsError() raise MsdImageExistsError()
await self.__remount_storage(rw=True) await self.__remount_rw(True)
self.__set_image_complete(name, False) self.__set_image_complete(name, False)
self.__new_writer = await MsdImageWriter(path, size, self.__sync_chunk_size).open() self.__new_writer = await MsdImageWriter(path, size, self.__sync_chunk_size).open()
@@ -340,7 +340,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
finally: finally:
await self.__close_new_writer() await self.__close_new_writer()
try: try:
await self.__remount_storage(rw=False) await self.__remount_rw(False)
except Exception: except Exception:
pass pass
finally: finally:
@@ -377,10 +377,10 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
self.__state.vd.image = None self.__state.vd.image = None
del self.__state.storage.images[name] del self.__state.storage.images[name]
await self.__remount_storage(rw=True) await self.__remount_rw(True)
os.remove(image.path) os.remove(image.path)
self.__set_image_complete(name, False) self.__set_image_complete(name, False)
await self.__remount_storage(rw=False) await self.__remount_rw(False)
# ===== # =====
@@ -450,8 +450,8 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
# Если только что включились и образ не подключен - попробовать # Если только что включились и образ не подключен - попробовать
# перемонтировать хранилище (и создать images и meta). # перемонтировать хранилище (и создать images и meta).
logger.info("Probing to remount storage ...") logger.info("Probing to remount storage ...")
await self.__remount_storage(rw=True) await self.__remount_rw(True)
await self.__remount_storage(rw=False) await self.__remount_rw(False)
await self.__setup_initial() await self.__setup_initial()
storage_state = self.__get_storage_state() storage_state = self.__get_storage_state()
@@ -550,6 +550,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
# ===== # =====
async def __remount_storage(self, rw: bool) -> None: async def __remount_rw(self, rw: bool) -> None:
if not (await aiohelpers.remount("MSD", self.__remount_cmd, rw)): if not (await aiohelpers.remount("MSD", self.__remount_cmd, rw)):
raise MsdError("Can't execute remount helper") raise MsdError("Can't execute remount helper")