localhorst/reHDDPrinter
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Add Checkbox connection type (SATA/NVME) to label #22

Merged
localhorst merged 6 commits from feature/drive-type-marker into main 2025-12-06 23:38:30 +01:00
Conversation 0 Commits 6 Files Changed 6 +57 -344
8 changed files with 57 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6dda384428 - Show all commits

6
layouter.py
View File

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