localhorst/reHDD
1
0
Fork 1
Code Issues 3 Pull Requests Releases 11 Wiki Activity

bugfix/dry-run-tui-freeze (#88)

Browse Source 
Fixes #87

Reviewed-on: #88
Co-authored-by: localhorst <localhorst@mosad.xyz>
Co-committed-by: localhorst <localhorst@mosad.xyz>
This commit is contained in:
Hendrik Schutter
2025-12-12 22:14:47 +01:00
committed by Hendrik Schutter
parent d749f23e77
commit c4a960f3cf
3 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/reHDD.cpp
View File

@ -226,10 +226,10 @@ void reHDD::ThreadShred(Drive *const pDrive)
{
if (pDrive != nullptr)
{
pDrive->setActionStartTimestamp(); // save timestamp at start of shredding
Shred *pShredTask = new Shred(); // create new shred task
pShredTask->shredDrive(pDrive, &fdShredInformPipe[1]); // start new shred task
delete pShredTask; // delete shred task
pDrive->setActionStartTimestamp(); // save timestamp at start of shredding
Shred *pShredInstance = new Shred(); // create new shred task
pShredInstance->shredDrive(pDrive, &fdShredInformPipe[1]); // start new shred task
delete pShredInstance; // delete shred task
ui->updateTUI(&listDrives, u16SelectedEntry);
}
}
@ -382,7 +382,13 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
list<Drive>::iterator it;
for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
{
if (it->getPath().find(systemDrivePath) != std::string::npos) // compare found system drive and current drive
string driveName = it->getPath();
// Remove /dev/ prefix
if (driveName.find("/dev/") == 0)
{
driveName = driveName.substr(5); // Skip "/dev/"
}
if (systemDrivePath.find(driveName) != std::string::npos) // compare found system drive and current drive
{
// system drive found --> ignore this drive
#ifdef LOG_LEVEL_HIGH
@ -709,14 +715,23 @@ bool reHDD::getSystemDrive(string &systemDrive)
continue;
}
// Logger::logThis()->info(currentLine);
// Extract drive name from line (removing tree characters)
if ((cLine[0U] != '|') && (cLine[0U] != '`'))
{
systemDrive = currentLine;
systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), '\n'), systemDrive.end()); // remove newline
systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), ' '), systemDrive.end()); // remove spaces
// Logger::logThis()->info("Drive found: " + systemDrive);
// Find the actual drive name (after tree characters like └─, ├─)
size_t lastAlpha = 0;
for (size_t i = 0; i < systemDrive.length(); i++)
{
if (isalpha(systemDrive[i]))
{
lastAlpha = i;
break;
}
}
systemDrive = systemDrive.substr(lastAlpha);
}
if (currentLine.ends_with(" /boot/efi\n"s))
@ -739,5 +754,17 @@ bool reHDD::getSystemDrive(string &systemDrive)
}
pclose(outputfileHwinfo);
// Remove mountpoint (everything after first space)
size_t spacePos = systemDrive.find(' ');
if (spacePos != std::string::npos)
{
systemDrive = systemDrive.substr(0, spacePos);
}
// Remove all unwanted characters
systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), '\n'), systemDrive.end());
systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), '/'), systemDrive.end());
systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), '\r'), systemDrive.end());
return systemDriveFound;
}