localhorst/reHDD
1
0
Fork 1
Code Issues 4 Pull Requests 1 Releases 10 Wiki Activity

State "Failed" if checksum is not zero #81

Merged
localhorst merged 4 commits from feature/failed-state into master 2025-12-10 22:30:51 +01:00
Conversation 0 Commits 4 Files Changed 3 +11 -4
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/drive.h
View File

@ -20,6 +20,8 @@ public:
SHRED_SELECTED, SHRED_SELECTED,
SHRED_ACTIVE, // shred iterations active SHRED_ACTIVE, // shred iterations active
CHECK_ACTIVE, // optional checking active CHECK_ACTIVE, // optional checking active
CHECK_SUCCESSFUL,
CHECK_FAILED,
DELETE_SELECTED, DELETE_SELECTED,
DELETE_ACTIVE, DELETE_ACTIVE,
FROZEN FROZEN

12
src/shred.cpp
View File

@ -192,26 +192,30 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
drive->state = Drive::TaskState::CHECK_ACTIVE; drive->state = Drive::TaskState::CHECK_ACTIVE;
Logger::logThis()->info("Check-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str()); Logger::logThis()->info("Check-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
drive->u32DriveChecksumAfterShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd); drive->u32DriveChecksumAfterShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd);
#ifdef LOG_LEVEL_HIGH
if (drive->u32DriveChecksumAfterShredding != 0) if (drive->u32DriveChecksumAfterShredding != 0)
{ {
drive->state = Drive::TaskState::CHECK_FAILED;
Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial()); Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
} }
else else
{ {
drive->state = Drive::TaskState::CHECK_SUCCESSFUL;
Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial()); Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
} }
#endif #endif
#endif
#endif #endif
cleanup(); cleanup();
if ((drive->state.load() == Drive::TaskState::SHRED_ACTIVE) || (drive->state.load() == Drive::TaskState::CHECK_ACTIVE)) if ((drive->state.load() == Drive::TaskState::SHRED_ACTIVE) || (drive->state.load() == Drive::TaskState::CHECK_SUCCESSFUL) || (drive->state == Drive::TaskState::CHECK_FAILED))
{ {
if (drive->state != Drive::TaskState::CHECK_FAILED)
{
Printer::getPrinter()->print(drive);
}
drive->state = Drive::TaskState::NONE; drive->state = Drive::TaskState::NONE;
drive->setTaskPercentage(0.0); drive->setTaskPercentage(0.0);
Printer::getPrinter()->print(drive);
Logger::logThis()->info("Finished shred/check for: " + drive->getModelName() + "-" + drive->getSerial()); Logger::logThis()->info("Finished shred/check for: " + drive->getModelName() + "-" + drive->getSerial());
} }
return 0; return 0;

1
src/tui.cpp
View File

@ -154,6 +154,7 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
case Drive::TaskState::NONE: case Drive::TaskState::NONE:
case Drive::TaskState::SHRED_SELECTED: case Drive::TaskState::SHRED_SELECTED:
case Drive::TaskState::DELETE_SELECTED: case Drive::TaskState::DELETE_SELECTED:
case Drive::TaskState::CHECK_SUCCESSFUL:
{ {
if (it->bWasDeleted) if (it->bWasDeleted)
{ {