layouter.py

@@ -34,6 +34,7 @@ logging.basicConfig(
 class DriveData:
     drive_index: int
     drive_state: str
+    drive_connection_type: str
     modelfamily: str
     modelname: str
     capacity: int
@@ -48,6 +49,7 @@ class DriveData:
 @dataclasses.dataclass
 class DriveDataJson:
     state: str
+    connection_type: str
     fam: str
     name: str
     cap: int
@@ -61,6 +63,7 @@ class DriveDataJson:
 
 @dataclasses.dataclass
 class DriveDataPrintable:
+    connectiontype: str
     modelfamily: str
     modelname: str
     capacity: str
@@ -132,6 +135,7 @@ def cut_string(max_length, data, direction="end"):
 
 def format_to_printable(drive):
     return DriveDataPrintable(
+        drive.drive_connection_type,
         cut_string(20, re.sub(r"[^a-zA-Z0-9. ]", "", drive.modelfamily), "end"),
         cut_string(20, re.sub(r"[^a-zA-Z0-9. ]", "", drive.modelname), "end"),
         cut_string(20, human_readable_capacity(drive.capacity), "end"),
@@ -306,6 +310,7 @@ def generate_image(drive, rehdd_info, output_file):
 
         drive_json = DriveDataJson(
             state=drive.drive_state,
+            connection_type=drive.drive_connection_type,
             fam=drive.modelfamily,
             name=drive.modelname,
             cap=drive.capacity,
@@ -346,6 +351,7 @@ def main():
 
     temp_drive = DriveData(
         drive_index=0,
+        drive_connection_type="sata",
         drive_state="shredded",
         modelfamily='Toshiba 2.5" HDD MK..65GSSX',
         modelname="TOSHIBA MK3265GSDX",