From 5602c960565ffe23a771f8f9fa221fb8ed04303d Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Thu, 27 Jun 2024 17:41:46 +0300 Subject: [PATCH] feat(services): rename "sda1" to "system disk" and etc (#122) Closes #51 Reviewed-on: https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api/pulls/122 Reviewed-by: Inex Code Co-authored-by: Maxim Leshchenko Co-committed-by: Maxim Leshchenko --- selfprivacy_api/actions/services.py | 2 +- selfprivacy_api/utils/block_devices.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/selfprivacy_api/actions/services.py b/selfprivacy_api/actions/services.py index ebb0917..f9486d1 100644 --- a/selfprivacy_api/actions/services.py +++ b/selfprivacy_api/actions/services.py @@ -27,7 +27,7 @@ def move_service(service_id: str, volume_name: str) -> Job: job = Jobs.add( type_id=f"services.{service.get_id()}.move", name=f"Move {service.get_display_name()}", - description=f"Moving {service.get_display_name()} data to {volume.name}", + description=f"Moving {service.get_display_name()} data to {volume.get_display_name().lower()}", ) move_service_task(service, volume, job) diff --git a/selfprivacy_api/utils/block_devices.py b/selfprivacy_api/utils/block_devices.py index 4de5b75..0db8fe0 100644 --- a/selfprivacy_api/utils/block_devices.py +++ b/selfprivacy_api/utils/block_devices.py @@ -90,6 +90,14 @@ class BlockDevice: def __hash__(self): return hash(self.name) + def get_display_name(self) -> str: + if self.is_root(): + return "System disk" + elif self.model == "Volume": + return "Expandable volume" + else: + return self.name + def is_root(self) -> bool: """ Return True if the block device is the root device.