From 67ab1cd15be90ed3c14bbfa10d7c675395345e86 Mon Sep 17 00:00:00 2001 From: Damien Thenot Date: Thu, 16 Jan 2025 16:29:51 +0100 Subject: [PATCH] Fix for type in cleanup.py Signed-off-by: Damien Thenot --- drivers/cleanup.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/cleanup.py b/drivers/cleanup.py index 329b4626d..1256c08e6 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -791,10 +791,7 @@ def __str__(self) -> str: strSizeAllocated = "?" if self._sizeAllocated >= 0: strSizeAllocated = "/%s" % Util.num2str(self._sizeAllocated) - strType = "" - if self.vdi_type == VdiType.RAW: - strType = "[RAW]" - strSizePhys = "" + strType = "[{}]".format(self.vdi_type) return "%s%s(%s%s%s)%s" % (strHidden, self.uuid[0:8], strSizeVirt, strSizePhys, strSizeAllocated, strType) @@ -1138,14 +1135,8 @@ class FileVDI(VDI): @staticmethod def extractUuid(path): - path = os.path.basename(path.strip()) - if not (path.endswith(VdiTypeExtension.VHD) or \ - path.endswith(VdiTypeExtension.RAW)): - return None - uuid = path.replace(VdiTypeExtension.VHD, "").replace( \ - VdiTypeExtension.RAW, "") - # TODO: validate UUID format - return uuid + fileName = os.path.basename(path) + return os.path.splitext(fileName)[0] def __init__(self, sr, uuid, vdi_type): VDI.__init__(self, sr, uuid, vdi_type) @@ -1170,13 +1161,13 @@ def load(self, info=None) -> None: self.hidden = info.hidden self.scanError = False self.path = os.path.join(self.sr.path, "%s%s" % \ - (self.uuid, VdiTypeExtension.VHD)) + (self.uuid, VDI_TYPE_TO_EXTENSION[self.vdi_type])) @override def rename(self, uuid) -> None: oldPath = self.path VDI.rename(self, uuid) - self.fileName = "%s%s" % (self.uuid, VdiTypeExtension.VHD) + self.fileName = "%s%s" % (self.uuid, VDI_TYPE_TO_EXTENSION[self.vdi_type]) self.path = os.path.join(self.sr.path, self.fileName) assert(not util.pathexists(self.path)) Util.log("Renaming %s -> %s" % (oldPath, self.path))