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

Compare commits

base: localhorst:master
Branches Tags
localhorst:master
localhorst:test/ipc-dummy
localhorst:1.2.0
localhorst:1.1.3
localhorst:1.1.2
localhorst:1.1.1
localhorst:b1.1.0
localhorst:b0.3.0
localhorst:b0.2.2
localhorst:b0.2.0
localhorst:b0.1.0
localhorst:1.0.0
..
compare: localhorst:1.1.1
Branches Tags
localhorst:master
localhorst:test/ipc-dummy
localhorst:1.2.0
localhorst:1.1.3
localhorst:1.1.2
localhorst:1.1.1
localhorst:b1.1.0
localhorst:b0.3.0
localhorst:b0.2.2
localhorst:b0.2.0
localhorst:b0.1.0
localhorst:1.0.0

No commits in common. "master" and "1.1.1" have entirely different histories.
master ... 1.1.1

10 changed files with 144 additions and 351 deletions
Show Stats Expand all files Collapse all files

2
README.md
View File

@ -9,7 +9,7 @@
* process multiple drives at once * process multiple drives at once
## Download USB Image ## ## Download USB Image ##
See reHDD-Bootable how the live image created: https://git.mosad.xyz/localhorst/reHDD-Bootable [2.5GB image v1.0.0](https://schuttercloud.com/s/ggxGH9sA326aRfK) (`wget` is your friend)
Use [Etcher](https://www.balena.io/etcher/#download) or `dd` to create an bootable USB drive . Use [Etcher](https://www.balena.io/etcher/#download) or `dd` to create an bootable USB drive .

13
include/drive.h
View File

@ -25,14 +25,6 @@ public:
FROZEN FROZEN
} state; } state;
enum ConnectionType
{
UNKNOWN,
USB,
SATA,
NVME
} connectionType;
struct struct
{ {
time_t u32ShredTimeDelta; time_t u32ShredTimeDelta;
@ -41,9 +33,8 @@ public:
unsigned long ulSpeedMetricBytesWritten; unsigned long ulSpeedMetricBytesWritten;
} sShredSpeed; } sShredSpeed;
bool bWasShredded = false; // all shred iterations done 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 bWasChecked = false; // all shred iterations and optional checking done
bool bWasDeleted = false; bool bWasDeleted = false;
bool bIsOffline = false; bool bIsOffline = false;
uint32_t u32DriveChecksumAfterShredding = 0U; uint32_t u32DriveChecksumAfterShredding = 0U;

10
include/reHDD.h
View File

@ -8,7 +8,7 @@
#ifndef REHDD_H_ #ifndef REHDD_H_
#define REHDD_H_ #define REHDD_H_
#define REHDD_VERSION "V1.2.0" #define REHDD_VERSION "V1.1.1"
// Drive handling Settings // Drive handling Settings
#define WORSE_HOURS 19200 // mark drive if at this limit or beyond #define WORSE_HOURS 19200 // mark drive if at this limit or beyond
@ -20,18 +20,18 @@
// Logger Settings // Logger Settings
#define LOG_PATH "./reHDD.log" #define LOG_PATH "./reHDD.log"
#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2025" #define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2024"
#define DEVICE_ID "generic" #define DEVICE_ID "generic"
#define SOFTWARE_VERSION REHDD_VERSION #define SOFTWARE_VERSION REHDD_VERSION
#define HARDWARE_VERSION "generic" #define HARDWARE_VERSION "generic"
// #define LOG_LEVEL_HIGH // log everything, like drive scan thread // #define LOG_LEVEL_HIGH //log everything, like drive scan thread
#ifndef LOG_LEVEL_HIGH #ifndef LOG_LEVEL_HIGH
#define LOG_LEVEL_LOW // log only user actions and tasks #define LOG_LEVEL_LOW // log only user actions and tasks
#endif #endif
// Logic // Logic
// #define DRYRUN // don't touch the drives // #define DRYRUN //don´t touch the drives
#define FROZEN_ALERT // show alert if drive is frozen #define FROZEN_ALERT // show alert if drive is frozen
#define ZERO_CHECK // check drive after shred if all bytes are zero, show alert if this fails #define ZERO_CHECK // check drive after shred if all bytes are zero, show alert if this fails
@ -86,7 +86,6 @@ private:
static void searchDrives(list<Drive> *plistDrives); static void searchDrives(list<Drive> *plistDrives);
static void printDrives(list<Drive> *plistDrives); static void printDrives(list<Drive> *plistDrives);
static void startShredAllDrives(list<Drive> *plistDrives); static void startShredAllDrives(list<Drive> *plistDrives);
static void stopShredAllDrives(list<Drive> *plistDrives);
static void updateShredMetrics(list<Drive> *plistDrives); static void updateShredMetrics(list<Drive> *plistDrives);
static void filterIgnoredDrives(list<Drive> *plistDrives); static void filterIgnoredDrives(list<Drive> *plistDrives);
static void filterInvalidDrives(list<Drive> *plistDrives); static void filterInvalidDrives(list<Drive> *plistDrives);
@ -102,7 +101,6 @@ private:
static void handleESC(); static void handleESC();
static void handleAbort(); static void handleAbort();
static Drive *getSelectedDrive(); static Drive *getSelectedDrive();
static bool getSystemDrive(string &systemDrive);
}; };
#endif // REHDD_H_ #endif // REHDD_H_

27
include/smart.h
View File

@ -19,15 +19,24 @@ public:
private: private:
SMART(void); SMART(void);
static bool parseExitStatus(string sLine, uint8_t &status); static uint8_t parseExitStatus(string sLine);
static bool parseModelFamily(string sLine, string &modelFamily); static void parseModelFamily(string sLine);
static bool parseModelName(string sLine, string &modelName); static void parseModelName(string sLine);
static bool parseSerial(string sLine, string &serial); static void parseSerial(string sLine);
static bool parseCapacity(string sLine, uint64_t &capacity); static void parseCapacity(string sLine);
static bool parseErrorCount(string sLine, uint32_t &errorCount); static void parseErrorCount(string sLine);
static bool parsePowerOnHours(string sLine, uint32_t &powerOnHours); static void parsePowerOnHours(string sLine);
static bool parsePowerCycles(string sLine, uint32_t &powerCycles); static void parsePowerCycle(string sLine);
static bool parseTemperature(string sLine, uint32_t &temperature); static void parseTemperature(string sLine);
static string modelFamily;
static string modelName;
static string serial;
static uint64_t capacity;
static uint32_t errorCount;
static uint32_t powerOnHours;
static uint32_t powerCycle;
static uint32_t temperature;
}; };
#endif // SMART_H_ #endif // SMART_H_

3
include/tui.h
View File

@ -31,7 +31,6 @@ public:
Delete, Delete,
Enter, Enter,
ESC, ESC,
Terminate,
Undefined Undefined
}; };
struct MenuState struct MenuState
@ -67,7 +66,7 @@ private:
static WINDOW *createOverViewWindow(int iXSize, int iYSize); static WINDOW *createOverViewWindow(int iXSize, int iYSize);
static WINDOW *createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive drive); static WINDOW *createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive drive);
static WINDOW *overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart); static WINDOW *overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart);
static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, string sConnection, bool bSelected); static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, bool bSelected);
static WINDOW *createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart); static WINDOW *createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart);
static WINDOW *createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, struct MenuState menustate); static WINDOW *createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, struct MenuState menustate);
static WINDOW *createDialog(int iXSize, int iYSize, int iXStart, int iYStart, string selectedTask, string optionA, string optionB); static WINDOW *createDialog(int iXSize, int iYSize, int iXStart, int iYStart, string selectedTask, string optionA, string optionB);

14
src/delete.cpp
View File

@ -32,15 +32,11 @@ void Delete::deleteDrive(Drive *drive)
const char *cpComand = sCMD.c_str(); const char *cpComand = sCMD.c_str();
// cout << "delete: " << cpComand << endl; // cout << "delete: " << cpComand << endl;
if (drive->bWasShredStarted == false) FILE *deleteCmdOutput = popen(cpComand, "r");
{
//only start delete if the drive was not shredded before
FILE *deleteCmdOutput = popen(cpComand, "r");
while ((getline(&cLine, &len, deleteCmdOutput)) != -1) while ((getline(&cLine, &len, deleteCmdOutput)) != -1)
{ {
// wipefs running // wipefs running
}
pclose(deleteCmdOutput);
} }
pclose(deleteCmdOutput);
} }

178
src/reHDD.cpp
View File

@ -197,12 +197,6 @@ void reHDD::ThreadUserInput()
handleESC(); handleESC();
ui->updateTUI(&listDrives, u8SelectedEntry); ui->updateTUI(&listDrives, u8SelectedEntry);
break; break;
case TUI::UserInput::Terminate:
cout << "Terminate" << endl;
stopShredAllDrives(&listDrives);
sleep(5); // sleep 5 sec
std::exit(1); // Terminates main, doesn't wait for threads
break;
default: default:
break; break;
} }
@ -306,51 +300,41 @@ void reHDD::filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDr
* \param pointer of list <Drive>* plistDrives * \param pointer of list <Drive>* plistDrives
* \return void * \return void
*/ */
void reHDD::searchDrives(std::list<Drive> *plistDrives) void reHDD::searchDrives(list<Drive> *plistDrives)
{ {
FILE *fp = popen("lsblk -d -n -o NAME,TRAN", "r"); // Logger::logThis()->info("--> search drives <--");
if (!fp) char *cLine = NULL;
size_t len = 0;
FILE *outputfileHwinfo = popen("lsblk -e 11 -d -o NAME", "r");
if (outputfileHwinfo == NULL)
{ {
Logger::logThis()->error("Unable to execute lsblk to scan drives"); Logger::logThis()->error("Unable to scan attached drives");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
char line[256]; while ((getline(&cLine, &len, outputfileHwinfo)) != -1)
while (fgets(line, sizeof(line), fp))
{ {
std::string devName, transport; if (string(cLine).length() == 4)
std::istringstream iss(line); {
iss >> devName >> transport; Drive *tmpDrive = new Drive("/dev/" + string(cLine).substr(0, 3));
tmpDrive->state = Drive::NONE;
tmpDrive->bIsOffline = false;
plistDrives->push_back(*tmpDrive);
// Logger::logThis()->info("SATA drive found: " + tmpDrive->getPath());
}
if (devName.empty()) if (string(cLine).length() == 8)
continue; {
Drive *tmpDrive = new Drive("/dev/" + string(cLine).substr(0, 7));
Drive *tmpDrive = new Drive("/dev/" + devName); tmpDrive->state = Drive::NONE;
tmpDrive->state = Drive::NONE; tmpDrive->bIsOffline = false;
tmpDrive->bIsOffline = false; plistDrives->push_back(*tmpDrive);
// Logger::logThis()->info("NVME drive found: " + tmpDrive->getPath());
// Set connection type }
if (transport == "sata")
tmpDrive->connectionType = Drive::SATA;
else if (transport == "usb")
tmpDrive->connectionType = Drive::USB;
else if (transport == "nvme")
tmpDrive->connectionType = Drive::NVME;
else
tmpDrive->connectionType = Drive::UNKNOWN;
plistDrives->push_back(*tmpDrive);
Logger::logThis()->info(
"Drive found: " + tmpDrive->getPath() +
" (type: " +
(tmpDrive->connectionType == Drive::USB ? "USB" : tmpDrive->connectionType == Drive::SATA ? "SATA"
: tmpDrive->connectionType == Drive::NVME ? "NVME"
: "UNKNOWN") +
")");
} }
pclose(outputfileHwinfo);
pclose(fp);
} }
/** /**
@ -360,26 +344,6 @@ void reHDD::searchDrives(std::list<Drive> *plistDrives)
*/ */
void reHDD::filterIgnoredDrives(list<Drive> *plistDrives) void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
{ {
string systemDrivePath;
if (getSystemDrive(systemDrivePath))
{
// Logger::logThis()->info("Found system drive: " + systemDrivePath);
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
{
// system drive found --> ignore this drive
#ifdef LOG_LEVEL_HIGH
Logger::logThis()->info("system drive found --> ignore this drive: " + it->getPath());
#endif
it = plistDrives->erase(it);
it--;
}
}
}
list<tuple<string>> vtlIgnoredDevices; // store drives from ignore file list<tuple<string>> vtlIgnoredDevices; // store drives from ignore file
ifstream input("ignoreDrives.conf"); // read ignore file ifstream input("ignoreDrives.conf"); // read ignore file
@ -480,34 +444,6 @@ void reHDD::startShredAllDrives(list<Drive> *plistDrives)
mxDrives.unlock(); mxDrives.unlock();
} }
/**
* \brief stop shred for all drives
* \param pointer of list <Drive>* plistDrives
* \return void
*/
void reHDD::stopShredAllDrives(list<Drive> *plistDrives)
{
list<Drive>::iterator it;
mxDrives.lock();
for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
{
if (it->state == Drive::SHRED_ACTIVE || it->state == Drive::DELETE_ACTIVE)
{
it->state = Drive::NONE;
Logger::logThis()->info("Abort-Shred-Signal for: " + it->getModelName() + "-" + it->getSerial());
// task for drive is running --> remove selection
}
#ifdef LOG_LEVEL_HIGH
ostringstream address;
address << (void const *)&(*it);
Logger::logThis()->info("Started shred (all) for: " + it->getModelName() + "-" + it->getSerial() + " @" + address.str());
#endif
}
mxDrives.unlock();
}
/** /**
* \brief print drives with all information * \brief print drives with all information
* \param pointer of list <Drive>* plistDrives * \param pointer of list <Drive>* plistDrives
@ -624,7 +560,7 @@ void reHDD::handleEnter()
{ {
Logger::logThis()->info("Started shred/check for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial()); Logger::logThis()->info("Started shred/check for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
getSelectedDrive()->state = Drive::TaskState::SHRED_ACTIVE; getSelectedDrive()->state = Drive::TaskState::SHRED_ACTIVE;
// task for drive is running --> don't show more task options // task for drive is running --> don´t show more task options
Drive *pTmpDrive = getSelectedDrive(); Drive *pTmpDrive = getSelectedDrive();
thread(ThreadShred, pTmpDrive).detach(); thread(ThreadShred, pTmpDrive).detach();
} }
@ -633,7 +569,7 @@ void reHDD::handleEnter()
{ {
Logger::logThis()->info("Started delete for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial()); Logger::logThis()->info("Started delete for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
getSelectedDrive()->state = Drive::TaskState::DELETE_ACTIVE; getSelectedDrive()->state = Drive::TaskState::DELETE_ACTIVE;
// task for drive is running --> don't show more task options // task for drive is running --> don´t show more task options
thread(ThreadDelete).detach(); thread(ThreadDelete).detach();
} }
} }
@ -669,59 +605,3 @@ void reHDD::handleAbort()
} }
} }
} }
bool reHDD::getSystemDrive(string &systemDrive)
{
char *cLine = NULL;
size_t len = 0;
bool systemDriveFound = false;
FILE *outputfileHwinfo = popen("lsblk -e 11 -o NAME,MOUNTPOINT", "r");
if (outputfileHwinfo == NULL)
{
Logger::logThis()->error("Unable to scan attached drives for system drive");
exit(EXIT_FAILURE);
}
while ((getline(&cLine, &len, outputfileHwinfo)) != -1)
{
string currentLine = cLine;
if (currentLine.find("NAME") != std::string::npos)
{
continue;
}
// Logger::logThis()->info(currentLine);
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);
}
if (currentLine.ends_with(" /boot/efi\n"s))
{
systemDriveFound = true;
break;
}
if (currentLine.ends_with(" /run/overlay/live\n"s))
{
systemDriveFound = true;
break;
}
if (currentLine.ends_with(" /\n"s))
{
systemDriveFound = true;
break;
}
}
pclose(outputfileHwinfo);
return systemDriveFound;
}

7
src/shred.cpp
View File

@ -36,7 +36,6 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
ostringstream address; ostringstream address;
address << (void const *)&(*drive); address << (void const *)&(*drive);
Logger::logThis()->info("Shred-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str()); Logger::logThis()->info("Shred-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
drive->bWasShredStarted = true; //Mark drive as partly shredded
#ifdef DRYRUN #ifdef DRYRUN
for (int i = 0; i <= 500; i++) for (int i = 0; i <= 500; i++)
@ -49,7 +48,6 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
write(*ipSignalFd, "A", 1); write(*ipSignalFd, "A", 1);
usleep(20000); usleep(20000);
} }
drive->bWasShredded = true;
#endif #endif
#ifndef DRYRUN #ifndef DRYRUN
@ -92,7 +90,8 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
tfng_prng_seedkey(ucKey); tfng_prng_seedkey(ucKey);
this->ulDriveByteSize = getDriveSizeInBytes(driveFileDiscr); this->ulDriveByteSize = getDriveSizeInBytes(driveFileDiscr);
drive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now(); // set inital timestamp for speed metric drive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();
; // set inital timestamp for speed metric
drive->sShredSpeed.ulSpeedMetricBytesWritten = 0U; // uses to calculate speed metric drive->sShredSpeed.ulSpeedMetricBytesWritten = 0U; // uses to calculate speed metric
#ifdef LOG_LEVEL_HIGH #ifdef LOG_LEVEL_HIGH
@ -187,7 +186,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
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 #ifdef LOG_LEVEL_HIGH
if (drive->u32DriveChecksumAfterShredding != 0) if (drive->u32DriveChecksumAferShredding != 0)
{ {
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());
} }

206
src/smart.cpp
View File

@ -7,6 +7,15 @@
#include "../include/reHDD.h" #include "../include/reHDD.h"
string SMART::modelFamily;
string SMART::modelName;
string SMART::serial;
uint64_t SMART::capacity = 0U;
uint32_t SMART::errorCount = 0U;
uint32_t SMART::powerOnHours = 0U;
uint32_t SMART::powerCycle = 0U;
uint32_t SMART::temperature = 0U;
/** /**
* \brief get and set S.M.A.R.T. values in Drive * \brief get and set S.M.A.R.T. values in Drive
* \param pointer of Drive instance * \param pointer of Drive instance
@ -14,20 +23,16 @@
*/ */
void SMART::readSMARTData(Drive *drive) void SMART::readSMARTData(Drive *drive)
{ {
string modelFamily;
string modelName;
string serial;
uint64_t capacity = 0U;
uint32_t errorCount = 0U;
uint32_t powerOnHours = 0U;
uint32_t powerCycles = 0U;
uint32_t temperature = 0U;
modelFamily.clear(); modelFamily.clear();
modelName.clear(); modelName.clear();
serial.clear(); serial.clear();
capacity = 0U;
errorCount = 0U;
powerOnHours = 0U;
powerCycle = 0U;
temperature = 0U;
string sSmartctlCommands[] = {" --json -a ", " --json -d sntjmicron -a ", " --json -d sntasmedia -a ", " --json -d sntrealtek -a ", " --json -d sat -a "}; string sSmartctlCommands[] = {" --json -a ", " --json -d sntjmicron -a ", " --json -d sntasmedia -a ", " --json -d sntrealtek -a "};
for (string sSmartctlCommand : sSmartctlCommands) for (string sSmartctlCommand : sSmartctlCommands)
{ {
@ -36,26 +41,24 @@ void SMART::readSMARTData(Drive *drive)
sCMD.append(drive->getPath()); sCMD.append(drive->getPath());
const char *cpComand = sCMD.c_str(); const char *cpComand = sCMD.c_str();
//Logger::logThis()->info(cpComand);
FILE *outputfileSmart = popen(cpComand, "r"); FILE *outputfileSmart = popen(cpComand, "r");
size_t len = 0U; // length of found line size_t len = 0; // length of found line
char *cLine = NULL; // found line char *cLine = NULL; // found line
uint8_t status = 255U; uint8_t status = 255;
while ((getline(&cLine, &len, outputfileSmart)) != -1) while ((getline(&cLine, &len, outputfileSmart)) != -1)
{ {
string sLine = string(cLine); string sLine = string(cLine);
SMART::parseExitStatus(sLine, status); status = SMART::parseExitStatus(sLine);
SMART::parseModelFamily(sLine, modelFamily); SMART::parseModelFamily(sLine);
SMART::parseModelName(sLine, modelName); SMART::parseModelName(sLine);
SMART::parseSerial(sLine, serial); SMART::parseSerial(sLine);
SMART::parseCapacity(sLine, capacity); SMART::parseCapacity(sLine);
SMART::parseErrorCount(sLine, errorCount); SMART::parseErrorCount(sLine);
SMART::parsePowerOnHours(sLine, powerOnHours); SMART::parsePowerOnHours(sLine);
SMART::parsePowerCycles(sLine, powerCycles); SMART::parsePowerCycle(sLine);
SMART::parseTemperature(sLine, temperature); SMART::parseTemperature(sLine);
} }
pclose(outputfileSmart); pclose(outputfileSmart);
@ -63,89 +66,71 @@ void SMART::readSMARTData(Drive *drive)
if (status == 0U) if (status == 0U)
{ {
// Found S.M.A.R.T. data with this command // Found S.M.A.R.T. data with this command
//Logger::logThis()->info("Found S.M.A.R.T. data with this command");
break; break;
} }
} }
drive->setDriveSMARTData(modelFamily, modelName, serial, capacity, errorCount, powerOnHours, powerCycles, temperature); // write data in drive drive->setDriveSMARTData(modelFamily, modelName, serial, capacity, errorCount, powerOnHours, powerCycle, temperature); // wirte data in drive
} }
/** /**
* \brief parse ExitStatus * \brief parse ExitStatus
* \param string output line of smartctl * \param string output line of smartctl
* \param uint8_t parsed status * \return uint_8 exit status
* \return bool if parsing was possible
*/ */
bool SMART::parseExitStatus(string sLine, uint8_t &status) uint8_t SMART::parseExitStatus(string sLine)
{ {
uint8_t exitStatus = -1;
string search("\"exit_status\": "); string search("\"exit_status\": ");
size_t found = sLine.find(search); size_t found = sLine.find(search);
if (found != string::npos) if (found != string::npos)
{ {
sLine.erase(0U, sLine.find(": ") + 1U); sLine.erase(0, sLine.find(": ") + 1);
status = stol(sLine); exitStatus = stol(sLine);
return true;
}
else
{
return false;
} }
return exitStatus;
} }
/** /**
* \brief parse ModelFamily * \brief parse ModelFamiliy
* \param string output line of smartctl * \param string output line of smartctl
* \param string parsed model family * \return void
* \return bool if parsing was possible
*/ */
bool SMART::parseModelFamily(string sLine, string &modelFamily) void SMART::parseModelFamily(string sLine)
{ {
string search("\"model_family\": "); string search("\"model_family\": ");
size_t found = sLine.find(search); size_t found = sLine.find(search);
if (found != string::npos) if (found != string::npos)
{ {
sLine.erase(0U, sLine.find(": ") + 3U); sLine.erase(0, sLine.find(": ") + 3);
sLine.erase(sLine.length() - 3U, 3U); sLine.erase(sLine.length() - 3, 3);
modelFamily = sLine; modelFamily = sLine;
return true;
}
else
{
return false;
} }
} }
/** /**
* \brief parse ModelName * \brief parse ModelName
* \param string output line of smartctl * \param string output line of smartctl
* \param string parsed model name * \return void
* \return bool if parsing was possible
*/ */
bool SMART::parseModelName(string sLine, string &modelName) void SMART::parseModelName(string sLine)
{ {
string search("\"model_name\": "); string search("\"model_name\": ");
size_t found = sLine.find(search); size_t found = sLine.find(search);
if (found != string::npos) if (found != string::npos)
{ {
sLine.erase(0U, sLine.find(": ") + 3U); sLine.erase(0, sLine.find(": ") + 3);
sLine.erase(sLine.length() - 3U, 3U); sLine.erase(sLine.length() - 3, 3);
modelName = sLine; modelName = sLine;
return true;
}
else
{
return false;
} }
} }
/** /**
* \brief parse Serial * \brief parse Serial
* \param string output line of smartctl * \param string output line of smartctl
* \param string parsed serial * \return void
* \return bool if parsing was possible
*/ */
bool SMART::parseSerial(string sLine, string &serial) void SMART::parseSerial(string sLine)
{ {
string search("\"serial_number\": "); string search("\"serial_number\": ");
size_t found = sLine.find(search); size_t found = sLine.find(search);
@ -154,21 +139,15 @@ bool SMART::parseSerial(string sLine, string &serial)
sLine.erase(0, sLine.find(": ") + 3); sLine.erase(0, sLine.find(": ") + 3);
sLine.erase(sLine.length() - 3, 3); sLine.erase(sLine.length() - 3, 3);
serial = sLine; serial = sLine;
return true;
}
else
{
return false;
} }
} }
/** /**
* \brief parse Capacity * \brief parse Capacity
* \param string output line of smartctl * \param string output line of smartctl
* \param string parsed capacity * \return void
* \return bool if parsing was possible
*/ */
bool SMART::parseCapacity(string sLine, uint64_t &capacity) void SMART::parseCapacity(string sLine)
{ {
string search("\"bytes\": "); string search("\"bytes\": ");
size_t found = sLine.find(search); size_t found = sLine.find(search);
@ -177,67 +156,49 @@ bool SMART::parseCapacity(string sLine, uint64_t &capacity)
sLine.erase(0, sLine.find(": ") + 2); sLine.erase(0, sLine.find(": ") + 2);
sLine.erase(sLine.length() - 1, 1); sLine.erase(sLine.length() - 1, 1);
capacity = stol(sLine); capacity = stol(sLine);
return true;
}
else
{
return false;
} }
} }
/** /**
* \brief parse ErrorCount * \brief parse ErrorCount
* \param string output line of smartctl * \param string output line of smartctl
* \param uint32_t parsed error count * \return void
* \return bool if parsing was possible
*/ */
bool SMART::parseErrorCount(string sLine, uint32_t &errorCount) void SMART::parseErrorCount(string sLine)
{ {
string search("\"error_count_total\": "); string search("\"error_count_total\": ");
size_t found = sLine.find(search); size_t found = sLine.find(search);
if (found != string::npos) if (found != string::npos)
{ {
sLine.erase(0U, sLine.find(": ") + 2U); sLine.erase(0, sLine.find(": ") + 2);
sLine.erase(sLine.length() - 2U, 2U); sLine.erase(sLine.length() - 2, 2);
errorCount = stol(sLine); errorCount = stol(sLine);
return true;
}
else
{
return false;
} }
} }
/** /**
* \brief parse PowerOnHours * \brief parse PowerOnHours
* \param string output line of smartctl\ * \param string output line of smartctl
* \param uint32_t parsed power on hours * \return void
* \return bool if parsing was possible
*/ */
bool SMART::parsePowerOnHours(string sLine, uint32_t &powerOnHours) void SMART::parsePowerOnHours(string sLine)
{ {
string search("\"hours\": "); string search("\"hours\": ");
size_t found = sLine.find(search); size_t found = sLine.find(search);
if (found != string::npos) if (found != string::npos)
{ {
sLine.erase(0U, sLine.find(": ") + 2U); sLine.erase(0, sLine.find(": ") + 2);
sLine.erase(sLine.length() - 1U, 1U); sLine.erase(sLine.length() - 1, 1);
powerOnHours = stol(sLine); powerOnHours = stol(sLine);
return true;
}
else
{
return false;
} }
} }
/** /**
* \brief parse PowerCycle * \brief parse PowerCycle
* \param string output line of smartctl * \param string output line of smartctl
* \param uint32_t parsed power cycles * \return void
* \return bool if parsing was possible
*/ */
bool SMART::parsePowerCycles(string sLine, uint32_t &powerCycles) void SMART::parsePowerCycle(string sLine)
{ {
string search("\"power_cycle_count\": "); string search("\"power_cycle_count\": ");
size_t found = sLine.find(search); size_t found = sLine.find(search);
@ -245,29 +206,23 @@ bool SMART::parsePowerCycles(string sLine, uint32_t &powerCycles)
{ {
sLine.erase(0, sLine.find(": ") + 2); sLine.erase(0, sLine.find(": ") + 2);
sLine.erase(sLine.length() - 2, 2); sLine.erase(sLine.length() - 2, 2);
powerCycles = stol(sLine); powerCycle = stol(sLine);
return true;
}
else
{
return false;
} }
} }
/** /**
* \brief parse temperature * \brief parse temperature
* \param string output line of smartctl * \param string output line of smartctl
* \param uint32_t parsed temperature * \return void
* \return bool if parsing was possible
*/ */
bool SMART::parseTemperature(string sLine, uint32_t &temperature) void SMART::parseTemperature(string sLine)
{ {
string search("\"current\": "); string search("\"current\": ");
size_t found = sLine.find(search); size_t found = sLine.find(search);
if (found != string::npos) if (found != string::npos)
{ {
sLine.erase(0U, sLine.find(": ") + 2U); sLine.erase(0, sLine.find(": ") + 2);
sLine.erase(sLine.length() - 1U, 2U); sLine.erase(sLine.length() - 1, 2);
if (sLine == "{") if (sLine == "{")
{ {
temperature = 0U; // this drive doesn't support temperature temperature = 0U; // this drive doesn't support temperature
@ -276,10 +231,5 @@ bool SMART::parseTemperature(string sLine, uint32_t &temperature)
{ {
temperature = stol(sLine); temperature = stol(sLine);
} }
return true;
}
else
{
return false;
} }
} }

35
src/tui.cpp
View File

@ -43,21 +43,11 @@ void TUI::initTUI()
init_pair(COLOR_AREA_ENTRY_EVEN, COLOR_BLACK, COLOR_WHITE); init_pair(COLOR_AREA_ENTRY_EVEN, COLOR_BLACK, COLOR_WHITE);
init_pair(COLOR_AREA_ENTRY_ODD, COLOR_BLUE, COLOR_WHITE); init_pair(COLOR_AREA_ENTRY_ODD, COLOR_BLUE, COLOR_WHITE);
#ifdef DRYRUN
init_pair(COLOR_AREA_ENTRY_SELECTED, COLOR_WHITE, COLOR_GREEN);
#else
init_pair(COLOR_AREA_ENTRY_SELECTED, COLOR_WHITE, COLOR_RED); init_pair(COLOR_AREA_ENTRY_SELECTED, COLOR_WHITE, COLOR_RED);
#endif
init_pair(COLOR_AREA_OVERVIEW, COLOR_BLACK, COLOR_WHITE); init_pair(COLOR_AREA_OVERVIEW, COLOR_BLACK, COLOR_WHITE);
init_pair(COLOR_AREA_DETAIL, COLOR_BLACK, COLOR_WHITE); init_pair(COLOR_AREA_DETAIL, COLOR_BLACK, COLOR_WHITE);
#ifdef DRYRUN
mvprintw(0, 2, "reHDD - HDD refurbishing tool - GPL 3.0 DRYRUN is active! Don't use in production!");
#else
mvprintw(0, 2, "reHDD - HDD refurbishing tool - GPL 3.0 "); mvprintw(0, 2, "reHDD - HDD refurbishing tool - GPL 3.0 ");
#endif
Logger::logThis()->info("UI successfully initialized"); Logger::logThis()->info("UI successfully initialized");
} }
@ -93,9 +83,6 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
string sSpeed = " "; string sSpeed = " ";
string sTime = " "; string sTime = " ";
string sTemp = it->sTemperatureToText(); string sTemp = it->sTemperatureToText();
string sConnection = (it->connectionType == Drive::USB ? "USB" : it->connectionType == Drive::SATA ? "SATA"
: it->connectionType == Drive::NVME ? "NVME"
: "");
bool bSelectedEntry = false; bool bSelectedEntry = false;
@ -185,7 +172,7 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
uint16_t u16StartOffsetY = (2 * (u8Index)); uint16_t u16StartOffsetY = (2 * (u8Index));
WINDOW *tmp = createEntryWindow((int)(u16StdscrX * (float)(3.0 / 7.0) - 2), 2, 3, u16StartOffsetY + 2, (distance(plistDrives->begin(), it) + 1), sModelFamily, sSerial, sCapacity, sState, sTime, sSpeed, sTemp, sConnection, bSelectedEntry); WINDOW *tmp = createEntryWindow((int)(u16StdscrX * (float)(3.0 / 7.0) - 2), 2, 3, u16StartOffsetY + 2, (distance(plistDrives->begin(), it) + 1), sModelFamily, sSerial, sCapacity, sState, sTime, sSpeed, sTemp, bSelectedEntry);
wrefresh(tmp); wrefresh(tmp);
u8Index++; u8Index++;
} // end loop though drives } // end loop though drives
@ -240,9 +227,6 @@ enum TUI::UserInput TUI::readUserInput()
case 'S': case 'S':
return TUI::UserInput::ShredAll; return TUI::UserInput::ShredAll;
break; break;
case 'T':
return TUI::UserInput::Terminate;
break;
default: default:
return TUI::UserInput::Undefined; return TUI::UserInput::Undefined;
break; break;
@ -348,7 +332,7 @@ WINDOW *TUI::overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart)
return newWindow; return newWindow;
} }
WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, string sConnection, bool bSelected) WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, bool bSelected)
{ {
WINDOW *newWindow; WINDOW *newWindow;
newWindow = newwin(iYSize, iXSize, iYStart, iXStart); newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
@ -393,7 +377,6 @@ WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart,
37-43: Capacity 37-43: Capacity
44: space 44: space
47-49: Temp 47-49: Temp
57-60: Connection Type
line:02 line:02
0-2: space 0-2: space
@ -410,7 +393,6 @@ WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart,
mvwaddstr(newWindow, 0, 3, sModelFamily.c_str()); mvwaddstr(newWindow, 0, 3, sModelFamily.c_str());
mvwaddstr(newWindow, 0, 37, sCapacity.c_str()); mvwaddstr(newWindow, 0, 37, sCapacity.c_str());
mvwaddstr(newWindow, 0, 47, sTemp.c_str()); mvwaddstr(newWindow, 0, 47, sTemp.c_str());
mvwaddstr(newWindow, 0, 57, sConnection.c_str());
vTruncateText(&sSerial, 28); vTruncateText(&sSerial, 28);
mvwaddstr(newWindow, 1, 3, sSerial.c_str()); mvwaddstr(newWindow, 1, 3, sSerial.c_str());
@ -490,12 +472,8 @@ WINDOW *TUI::createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, st
{ {
string sLineTmp = "Press d for Delete"; string sLineTmp = "Press d for Delete";
mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLineTmp.size() / 2), sLineTmp.c_str()); mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLineTmp.size() / 2), sLineTmp.c_str());
u16Line++;
} }
string sLineTmp = "Press T for terminating reHDD";
mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLineTmp.size() / 2), sLineTmp.c_str());
return newWindow; return newWindow;
} }
@ -625,7 +603,6 @@ void TUI::vTruncateText(string *psText, uint16_t u16MaxLenght)
void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY) void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
{ {
struct MenuState menustate; struct MenuState menustate;
static bool dialogIsActive;
menustate.bAbort = false; menustate.bAbort = false;
menustate.bConfirmDelete = false; menustate.bConfirmDelete = false;
menustate.bConfirmShred = false; menustate.bConfirmShred = false;
@ -672,21 +649,15 @@ void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
{ {
dialog = createDialog(40, 10, ((stdscrX) - (int)(stdscrX / 3) - 7) - (int)((stdscrX / 3) + 5) / 2, (int)(stdscrY / 2) - 5, "Confirm SHRED", "Press ENTER for SHRED", "Press ESC for cancel"); dialog = createDialog(40, 10, ((stdscrX) - (int)(stdscrX / 3) - 7) - (int)((stdscrX / 3) + 5) / 2, (int)(stdscrY / 2) - 5, "Confirm SHRED", "Press ENTER for SHRED", "Press ESC for cancel");
wrefresh(dialog); wrefresh(dialog);
dialogIsActive = true;
} }
else if (menustate.bConfirmDelete == true) else if (menustate.bConfirmDelete == true)
{ {
dialog = createDialog(40, 10, ((stdscrX) - (int)(stdscrX / 3) - 7) - (int)((stdscrX / 3) + 5) / 2, (int)(stdscrY / 2) - 5, "Confirm DELETE", "Press ENTER for DELETE", "Press ESC for cancel"); dialog = createDialog(40, 10, ((stdscrX) - (int)(stdscrX / 3) - 7) - (int)((stdscrX / 3) + 5) / 2, (int)(stdscrY / 2) - 5, "Confirm DELETE", "Press ENTER for DELETE", "Press ESC for cancel");
wrefresh(dialog); wrefresh(dialog);
dialogIsActive = true;
} }
else else
{ {
if (dialogIsActive) delwin(dialog);
{
delwin(dialog);
dialogIsActive = false;
}
} }
} }