Compare commits
1 Commits
master
...
feature/fa
| Author | SHA1 | Date | |
|---|---|---|---|
| 298192111d |
@ -20,6 +20,8 @@ public:
|
||||
SHRED_SELECTED,
|
||||
SHRED_ACTIVE, // shred iterations active
|
||||
CHECK_ACTIVE, // optional checking active
|
||||
CHECK_SUCCESSFUL,
|
||||
CHECK_FAILED,
|
||||
DELETE_SELECTED,
|
||||
DELETE_ACTIVE,
|
||||
FROZEN
|
||||
|
||||
@ -186,22 +186,23 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
|
||||
drive->state = Drive::CHECK_ACTIVE;
|
||||
Logger::logThis()->info("Check-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
|
||||
drive->u32DriveChecksumAfterShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd);
|
||||
#ifdef LOG_LEVEL_HIGH
|
||||
|
||||
if (drive->u32DriveChecksumAfterShredding != 0)
|
||||
{
|
||||
drive->state = Drive::CHECK_FAILED;
|
||||
Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
|
||||
}
|
||||
else
|
||||
{
|
||||
drive->state = Drive::CHECK_SUCCESSFUL;
|
||||
Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
cleanup();
|
||||
|
||||
if ((drive->state == Drive::SHRED_ACTIVE) || (drive->state == Drive::CHECK_ACTIVE))
|
||||
if ((drive->state == Drive::SHRED_ACTIVE) || (drive->state == Drive::CHECK_SUCCESSFUL) || (drive->state == Drive::CHECK_FAILED))
|
||||
{
|
||||
drive->state = Drive::NONE;
|
||||
drive->setTaskPercentage(0.0);
|
||||
|
||||
@ -145,6 +145,7 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
|
||||
case Drive::NONE:
|
||||
case Drive::SHRED_SELECTED:
|
||||
case Drive::DELETE_SELECTED:
|
||||
case Drive::CHECK_SUCCESSFUL:
|
||||
if (it->bWasDeleted)
|
||||
{
|
||||
sState = "DELETED"; // mark drive as deleted previously
|
||||
@ -165,7 +166,7 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
|
||||
}
|
||||
|
||||
#ifdef ZERO_CHECK
|
||||
if (bSelectedEntry && it->bWasChecked && (it->u32DriveChecksumAfterShredding != 0U))
|
||||
if (bSelectedEntry && it->bWasChecked && (it->state == Drive::CHECK_FAILED))
|
||||
{
|
||||
dialog = createZeroChecksumWarning(70, 16, ((u16StdscrX) - (int)(u16StdscrX / 2) - 20), (int)(u16StdscrY / 2) - 8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial(), it->u32DriveChecksumAfterShredding);
|
||||
wrefresh(dialog);
|
||||
|
||||
Reference in New Issue
Block a user