localhorst/reHDD
1
0
Fork 0
Code Issues 7 Pull Requests Releases 9 Wiki Activity

Disable delete after shred was once started. #69

Closed
localhorst wants to merge 4 commits from feature/block-delete-after-shred into master
pull from: feature/block-delete-after-shred
merge into: localhorst:master
Conversation 0 Commits 4 Files Changed 3 +3 -1
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1e545993b0 - Show all commits

1
include/drive.h
View File

@ -34,6 +34,7 @@ public:
} sShredSpeed;
bool bWasShredded = false; // all shred iterations done
bool bWasShredStarted = false; // shred was atleast once started
bool bWasChecked = false; // all shred iterations and optional checking done
bool bWasDeleted = false;
bool bIsOffline = false;

2
src/reHDD.cpp
View File

@ -585,7 +585,7 @@ void reHDD::handleEnter()
thread(ThreadShred, pTmpDrive).detach();
}
if (getSelectedDrive()->state == Drive::TaskState::DELETE_SELECTED)
if ((getSelectedDrive()->state == Drive::TaskState::DELETE_SELECTED) && (getSelectedDrive()->bWasShredStarted == false))
{
Logger::logThis()->info("Started delete for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
getSelectedDrive()->state = Drive::TaskState::DELETE_ACTIVE;

1
src/shred.cpp
View File

@ -36,6 +36,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
ostringstream address;
address << (void const *)&(*drive);
Logger::logThis()->info("Shred-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
drive->bWasShredStarted = true; //Mark drive as partly shredded
#ifdef DRYRUN
for (int i = 0; i <= 500; i++)