Cast mountpoints as a list by default

Release `v0.2.0`

pyarchitecture/__init__.py

@@ -5,7 +5,7 @@
 
 from pyarchitecture import cpu, disks, gpu, memory
 
-version = "0.1.1"
+version = "0.2.0"
 
 
 def all_components() -> Dict[str, Any]:

pyarchitecture/cpu/__init__.py

@@ -1,6 +1,5 @@
 import logging
 import os
-from typing import Dict
 
 from pyarchitecture import config
 from pyarchitecture.cpu import main

pyarchitecture/disks/linux.py

@@ -38,7 +38,6 @@ def drive_info(disk_lib: str | os.PathLike) -> List[Dict[str, str]]:
                 else:
                     disk_info["mountpoints"] = [device["mountpoint"]]
             elif not disk_info["mountpoints"]:
-                disk_info["mountpoints"] = ["Not Mounted"]
-            disk_info["mountpoints"] = ", ".join(disk_info["mountpoints"])
+                disk_info["mountpoints"] = []
             disks.append(disk_info)
     return disks

pyarchitecture/disks/macOS.py

@@ -51,7 +51,7 @@ def update_mountpoints(
                         device_ids[device_id].append(mount_point)
     for device_id, mountpoints in device_ids.items():
         if not mountpoints:
-            device_ids[device_id] = ["Not Mounted"]
+            device_ids[device_id] = []
     return device_ids
 
 
@@ -80,11 +80,11 @@ def parse_diskutil_output(stdout: str) -> List[Dict[str, str]]:
     return disks
 
 
-def drive_info(disk_lib: str | os.PathLike) -> List[Dict[str, str]]:
+def drive_info(disk_lib: str | os.PathLike) -> List[Dict[str, str | List[str]]]:
     """Get disks attached to macOS devices.
 
     Returns:
-        List[Dict[str, str]]:
+        List[Dict[str, str | List[str]]]:
         Returns disks information for macOS devices.
     """
     result = subprocess.run([disk_lib, "info", "-all"], capture_output=True, text=True)
@@ -107,5 +107,5 @@ def drive_info(disk_lib: str | os.PathLike) -> List[Dict[str, str]]:
             _ = device_ids[disk["Device Identifier"]]
     mountpoints = update_mountpoints(disks, device_ids)
     for disk in physical_disks:
-        disk["mountpoints"] = ", ".join(mountpoints[disk["device_id"]])
+        disk["mountpoints"] = mountpoints[disk["device_id"]]
     return physical_disks

pyarchitecture/disks/windows.py

@@ -33,11 +33,11 @@ def reformat_windows(data: Dict[str, str | int | float]) -> Dict[str, str]:
     return data
 
 
-def get_drives(disk_lib: str | os.PathLike) -> List[Dict[str, str]]:
+def get_drives(disk_lib: str | os.PathLike) -> List[Dict[str, str | List[str]]]:
     """Get physical drives connected to a Windows machine.
 
     Returns:
-        List[Dict[str, str]]:
+        List[Dict[str, str | List[str]]]:
         Returns the formatted data for all the drives as a list of key-value pairs.
     """
     # noinspection LongLine
@@ -147,20 +147,17 @@ def get_disk_usage(disk_lib: str | os.PathLike) -> Dict[str, List[str]]:
     return output_data
 
 
-def drive_info(disk_lib: str | os.PathLike) -> List[Dict[str, str]]:
+def drive_info(disk_lib: str | os.PathLike) -> List[Dict[str, str | List[str]]]:
     """Get disks attached to Windows devices.
 
     Returns:
-        List[Dict[str, str]]:
+        List[Dict[str, str | List[str]]]
         Returns disks information for Windows machines.
     """
     data = get_drives(disk_lib)
     usage = get_disk_usage(disk_lib)
     for item in data:
         device_id = item["id"]
         item.pop("id")
-        if device_id in usage:
-            item["mountpoints"] = ", ".join(usage[device_id])
-        else:
-            item["mountpoints"] = "Not Mounted"
+        item["mountpoints"] = usage.get(device_id, [])
     return data