diff options
Diffstat (limited to 'kvmd')
| -rw-r--r-- | kvmd/helpers/remount/__init__.py | 30 | ||||
| -rw-r--r-- | kvmd/plugins/msd/otg/storage.py | 19 |
2 files changed, 35 insertions, 14 deletions
diff --git a/kvmd/helpers/remount/__init__.py b/kvmd/helpers/remount/__init__.py index 1738a90e..c6373fec 100644 --- a/kvmd/helpers/remount/__init__.py +++ b/kvmd/helpers/remount/__init__.py @@ -57,15 +57,24 @@ def _mkdir(path: str) -> None: raise SystemExit(f"Can't create directory: {err}") -def _rmdir(path: str) -> None: +def _rmtree(path: str) -> None: if exists(path): - _log(f"RMDIR --- {path}") + _log(f"RMALL --- {path}") try: - os.rmdir(path) + shutil.rmtree(path) except Exception as err: raise SystemExit(f"Can't remove directory: {err}") +def _rm(path: str) -> None: + if exists(path): + _log(f"RM --- {path}") + try: + os.remove(path) + except Exception as err: + raise SystemExit(f"Can't remove file: {err}") + + def _move(src: str, dest: str) -> None: _log(f"MOVE --- {src} --> {dest}") try: @@ -85,15 +94,22 @@ def _chown(path: str, user: str) -> None: # ===== def _fix_msd(part: Partition) -> None: + # First images migration images_path = join(part.root_path, "images") meta_path = join(part.root_path, "meta") if exists(images_path) and exists(meta_path): - for name in os.listdir(meta_path): - _move(join(meta_path, name), join(part.root_path, f".__{name}")) - _rmdir(meta_path) for name in os.listdir(images_path): _move(join(images_path, name), os.path.join(part.root_path, name)) - _rmdir(images_path) + if not exists(join(meta_path, f"{name}.complete")): + open(os.path.join(part.root_path, f".__{name}.incomplete")).close() # pylint: disable=consider-using-with + _rmtree(images_path) + _rmtree(meta_path) + + # Second images migration + for name in os.listdir(part.root_path): + if name.startswith(".__") and name.endswith(".complete"): + _rm(join(part.root_path, name)) + if part.user: _chown(part.root_path, part.user) diff --git a/kvmd/plugins/msd/otg/storage.py b/kvmd/plugins/msd/otg/storage.py index 2efd87c0..08ac65e1 100644 --- a/kvmd/plugins/msd/otg/storage.py +++ b/kvmd/plugins/msd/otg/storage.py @@ -54,7 +54,7 @@ class Image(_ImageDc): super().__init__(name, path) self.__storage = storage (self.__dir_path, file_name) = os.path.split(path) - self.__complete_path = os.path.join(self.__dir_path, f".__{file_name}.complete") + self.__incomplete_path = os.path.join(self.__dir_path, f".__{file_name}.incomplete") self.__adopted = False async def _reload(self) -> None: # Only for Storage() and set_complete() @@ -80,7 +80,7 @@ class Image(_ImageDc): async def __is_complete(self) -> bool: if self.__storage: - return (await aiofiles.os.path.exists(self.__complete_path)) + return (not (await aiofiles.os.path.exists(self.__incomplete_path))) return True async def __is_removable(self) -> bool: @@ -113,26 +113,31 @@ class Image(_ImageDc): async def remove(self, fatal: bool) -> None: assert self.__storage + removed = False try: await aiofiles.os.remove(self.path) + removed = True self.__storage.images.pop(self.name, None) except FileNotFoundError: pass except Exception: if fatal: raise - await self.set_complete(False) + finally: + # Удаляем .incomplete вместе с файлом + if removed: + await self.set_complete(True) async def set_complete(self, flag: bool) -> None: assert self.__storage if flag: - async with aiofiles.open(self.__complete_path, "w"): - pass - else: try: - await aiofiles.os.remove(self.__complete_path) + await aiofiles.os.remove(self.__incomplete_path) except FileNotFoundError: pass + else: + async with aiofiles.open(self.__incomplete_path, "w"): + pass await self._reload() |