From e03956f2fef1312e91704e720c806a08cc7d32d6 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sat, 21 May 2022 14:39:42 -0700 Subject: [PATCH] Convert Disk description to a property --- scripts/wk/hw/disk.py | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/scripts/wk/hw/disk.py b/scripts/wk/hw/disk.py index d58d5734..3daa5aef 100644 --- a/scripts/wk/hw/disk.py +++ b/scripts/wk/hw/disk.py @@ -37,7 +37,6 @@ class Disk: """Object for tracking disk specific data.""" attributes: dict[Any, dict] = field(init=False, default_factory=dict) bus: str = field(init=False) - description: str = field(init=False) filesystem: str = field(init=False) log_sec: int = field(init=False) model: str = field(init=False) @@ -57,7 +56,6 @@ class Disk: def __post_init__(self) -> None: self.path = pathlib.Path(self.path).resolve() self.get_details() - self.set_description() enable_smart(self) update_smart_details(self) if not self.attributes and self.bus == 'USB': @@ -86,6 +84,14 @@ class Disk: present = True return present + @property + def description(self) -> str: + """Get disk description from details.""" + return ( + f'{bytes_to_string(self.size, use_binary=False)}' + f' ({self.bus}) {self.model} {self.serial}' + ) + def disable_disk_tests(self) -> None: """Disable all tests.""" LOG.warning('Disabling all tests for: %s', self.path) @@ -156,14 +162,6 @@ class Disk: if attr == 'size': setattr(self, attr, -1) - # Set description - self.description = ( - f'{bytes_to_string(self.size, use_binary=False)}' - f' ({self.bus})' - f' {self.model}' - f' {self.serial}' - ) - def get_labels(self) -> list[str]: """Build list of labels for this disk, returns list.""" labels = [] @@ -189,13 +187,6 @@ class Disk: return aligned - def set_description(self) -> None: - """Set disk description from details.""" - self.description = ( - f'{bytes_to_string(self.size, use_binary=False)}' - f' ({self.bus}) {self.model} {self.serial}' - ) - # Functions def get_disk_details_linux(path) -> dict[Any, Any]: