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 +71 -25
6 changed files with 71 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 731a00a644 - Show all commits

BIN
output.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

12
reHDDPrinter.py
View File

@ -43,10 +43,10 @@ class TDriveData(ctypes.Structure):
("caDriveShredDuration", ctypes.c_char * STR_BUFFER_SIZE), ("caDriveShredDuration", ctypes.c_char * STR_BUFFER_SIZE),
("caDriveCapacity", ctypes.c_char * STR_BUFFER_SIZE), ("caDriveCapacity", ctypes.c_char * STR_BUFFER_SIZE),
("caDriveState", ctypes.c_char * STR_BUFFER_SIZE), ("caDriveState", ctypes.c_char * STR_BUFFER_SIZE),
("caDriveConnectionType", ctypes.c_char * STR_BUFFER_SIZE),
("caDriveModelFamily", ctypes.c_char * STR_BUFFER_SIZE), ("caDriveModelFamily", ctypes.c_char * STR_BUFFER_SIZE),
("caDriveModelName", ctypes.c_char * STR_BUFFER_SIZE), ("caDriveModelName", ctypes.c_char * STR_BUFFER_SIZE),
("caDriveSerialnumber", ctypes.c_char * STR_BUFFER_SIZE), ("caDriveSerialnumber", ctypes.c_char * STR_BUFFER_SIZE),
("caDriveConnectionType", ctypes.c_char * STR_BUFFER_SIZE),
("caDriveReHddVersion", ctypes.c_char * STR_BUFFER_SIZE), ("caDriveReHddVersion", ctypes.c_char * STR_BUFFER_SIZE),
] ]
@ -102,12 +102,12 @@ def create_drive_objects(drive_info):
modelname=drive_info["driveModelName"], modelname=drive_info["driveModelName"],
capacity=int(drive_info["driveCapacity"]), capacity=int(drive_info["driveCapacity"]),
serialnumber=drive_info["driveSerialnumber"], serialnumber=drive_info["driveSerialnumber"],
drive_connection_type=drive_info["driveConnectionType"],
power_on_hours=int(drive_info["driveHours"]), power_on_hours=int(drive_info["driveHours"]),
power_cycle=int(drive_info["driveCycles"]), power_cycle=int(drive_info["driveCycles"]),
smart_error_count=int(drive_info["driveErrors"]), smart_error_count=int(drive_info["driveErrors"]),
shred_timestamp=int(drive_info["driveShredTimestamp"]), shred_timestamp=int(drive_info["driveShredTimestamp"]),
shred_duration=int(drive_info["driveShredDuration"]), shred_duration=int(drive_info["driveShredDuration"]),
drive_connection_type=drive_info["driveConnectionType"],
) )
rehdd_info = layouter.ReHddInfo( rehdd_info = layouter.ReHddInfo(
@ -132,6 +132,7 @@ def worker(queue_id, test_mode=False):
"driveShredDuration": 0, "driveShredDuration": 0,
"driveCapacity": 42, "driveCapacity": 42,
"driveState": "shredded", "driveState": "shredded",
"driveConnectionType": "sata",
"driveModelFamily": "modelFamily", "driveModelFamily": "modelFamily",
"driveModelName": "modelName", "driveModelName": "modelName",
"driveSerialnumber": "serial", "driveSerialnumber": "serial",
@ -166,10 +167,15 @@ def worker(queue_id, test_mode=False):
), ),
"driveCapacity": int(d.caDriveCapacity.decode().strip("\x00")), "driveCapacity": int(d.caDriveCapacity.decode().strip("\x00")),
"driveState": d.caDriveState.decode().strip("\x00"), "driveState": d.caDriveState.decode().strip("\x00"),
"driveConnectionType": d.caDriveConnectionType.decode().strip(
"\x00"
),
"driveModelFamily": d.caDriveModelFamily.decode().strip("\x00"), "driveModelFamily": d.caDriveModelFamily.decode().strip("\x00"),
"driveModelName": d.caDriveModelName.decode().strip("\x00"), "driveModelName": d.caDriveModelName.decode().strip("\x00"),
"driveSerialnumber": d.caDriveSerialnumber.decode().strip("\x00"), "driveSerialnumber": d.caDriveSerialnumber.decode().strip("\x00"),
"driveConnectionType": d.caDriveConnectionType.decode().strip("\x00"), "driveConnectionType": d.caDriveConnectionType.decode().strip(
"\x00"
),
"driveReHddVersion": d.caDriveReHddVersion.decode().strip("\x00"), "driveReHddVersion": d.caDriveReHddVersion.decode().strip("\x00"),
} }