diff --git a/README.md b/README.md index 5751534..1ee20cb 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,20 @@ # reHDD -## Useful for: -* checking new drives for the first time -* checking used drives for their next live +## Features: +* show S.M.A.R.T values of attached drives +* checking used drives for their next live based on threshold limits +* delete a drive instant with wipefs * deleting a drive securely via overwriting +* only needs a display and keyboard +* process multiple drives at once + +## Download USB Image ## +[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 . ## Screenshot -![alt text](https://git.mosad.xyz/localhorst/reHDD/raw/commit/42bc26eac95429e20c0f0d59f684dfec0d600e75/doc/screenshot.png "Screenshot") +![Screenshot of reHDD with multiple drives in different states](https://git.mosad.xyz/localhorst/reHDD/raw/commit/c40dfe2cbb8f86490b49caf82db70a10015f06f9/doc/screenshot.png "Screenshot") ## Debian Build Notes @@ -15,6 +23,11 @@ * `git submodule update` * `make release` +## Enable Label Printer ## + +Just install [reHDDPrinter](https://git.mosad.xyz/localhorst/reHDDPrinter). +No further settings needed. + ## Create Standalone with Debian 11 Instructions how to create a standalone machine that boots directly to reHDD. This is aimed for production use, like several drives a day shredding. @@ -26,7 +39,6 @@ Instructions how to create a standalone machine that boots directly to reHDD. Th ### Software requirements * `apt-get install hwinfo smartmontools curl htop sudo` - ### Installation clone this repo into /root/ diff --git a/doc/screenshot.png b/doc/screenshot.png index 0fd095e..52e3b7b 100644 Binary files a/doc/screenshot.png and b/doc/screenshot.png differ diff --git a/include/drive.h b/include/drive.h index e61bc8f..72037fe 100644 --- a/include/drive.h +++ b/include/drive.h @@ -16,7 +16,8 @@ class Drive public: enum TaskState {NONE, SHRED_SELECTED, - SHRED_ACTIVE, + SHRED_ACTIVE, //shred iterations active + CHECK_ACTIVE, //optional checking active DELETE_SELECTED, DELETE_ACTIVE, FROZEN @@ -30,10 +31,11 @@ public: unsigned long ulSpeedMetricBytesWritten; } sShredSpeed; - bool bWasShredded = false; - bool bWasDeleteted = false; + bool bWasShredded = false; //all shred iterations done + bool bWasChecked = false; //all shred iterations and optional checking done + bool bWasDeleted = false; bool bIsOffline = false; - uint32_t u32DriveChecksumAferShredding = 0U; + uint32_t u32DriveChecksumAfterShredding = 0U; private: string sPath; diff --git a/include/printer.h b/include/printer.h new file mode 100644 index 0000000..638c3e7 --- /dev/null +++ b/include/printer.h @@ -0,0 +1,60 @@ +/** + * @file printer.h + * @brief Send drive data to printer service using ipc msg queue + * @author Hendrik Schutter + * @date 24.11.2022 + */ + +#ifndef PRINTER_H_ +#define PRINTER_H_ + +#include "reHDD.h" + +#include +#include + +#define STR_BUFFER_SIZE 64U +#define IPC_MSG_QUEUE_KEY 0x1B11193C0 + +typedef struct +{ + char caDriveIndex[STR_BUFFER_SIZE]; + char caDriveHours[STR_BUFFER_SIZE]; + char caDriveCycles[STR_BUFFER_SIZE]; + char caDriveErrors[STR_BUFFER_SIZE]; + char caDriveShredTimestamp[STR_BUFFER_SIZE]; + char caDriveShredDuration[STR_BUFFER_SIZE]; + char caDriveCapacity[STR_BUFFER_SIZE]; + char caDriveState[STR_BUFFER_SIZE]; + char caDriveModelFamily[STR_BUFFER_SIZE]; + char caDriveModelName[STR_BUFFER_SIZE]; + char caDriveSerialnumber[STR_BUFFER_SIZE]; + char caDriveReHddVersion[STR_BUFFER_SIZE]; + +} t_driveData; + +typedef struct +{ + long msg_queue_type; + t_driveData driveData; +} t_msgQueueData; + + +class Printer +{ +protected: + +public: + static Printer* getPrinter(); + void print(Drive* drive); + +private: + static bool instanceFlag; + static Printer *single; + int msqid; + Printer(); + ~Printer(); + + +}; +#endif // PRINTER_H_ \ No newline at end of file diff --git a/include/reHDD.h b/include/reHDD.h index e3d3856..7b7387e 100644 --- a/include/reHDD.h +++ b/include/reHDD.h @@ -8,7 +8,7 @@ #ifndef REHDD_H_ #define REHDD_H_ -#define REHDD_VERSION "bV0.3.0" +#define REHDD_VERSION "bV1.1.0" // Drive handling Settings #define WORSE_HOURS 19200 //mark drive if at this limit or beyond @@ -33,7 +33,7 @@ // Logic //#define DRYRUN //don´t touch the drives #define FROZEN_ALERT //show alert if drive is frozen -#define ZERO_CHECK_ALERT //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 //IPC pipes #define READ 0 @@ -64,6 +64,7 @@ using namespace std; #include "shred.h" #include "delete.h" #include "tui.h" +#include "printer.h" #include "logger/logger.h" extern Logger* logging; @@ -90,7 +91,7 @@ private: static void filterIgnoredDrives(list * plistDrives); static void filterNewDrives(list * plistOldDrives, list * plistNewDrives); static void addSMARTData(list * plistDrives); - static void ThreadScannDevices(); + static void ThreadScanDevices(); static void ThreadUserInput(); static void ThreadShred(Drive* const pDrive); static void ThreadDelete(); diff --git a/include/tui.h b/include/tui.h index c4595fa..87b7ac9 100644 --- a/include/tui.h +++ b/include/tui.h @@ -12,9 +12,10 @@ #define COLOR_AREA_STDSCR 1 #define COLOR_AREA_OVERVIEW 2 -#define COLOR_AREA_ENTRY 3 -#define COLOR_AREA_ENTRY_SELECTED 4 -#define COLOR_AREA_DETAIL 5 +#define COLOR_AREA_ENTRY_EVEN 3 +#define COLOR_AREA_ENTRY_ODD 4 +#define COLOR_AREA_ENTRY_SELECTED 5 +#define COLOR_AREA_DETAIL 6 class TUI { @@ -52,7 +53,7 @@ private: WINDOW* dialog; WINDOW* smartWarning; - static void centerTitle(WINDOW *pwin, const char * title); + static void centerTitle(WINDOW* pwin, const char* title); static WINDOW *createOverViewWindow( int iXSize, int iYSize); static WINDOW *createDetailViewWindow( int iXSize, int iYSize, int iXStart, Drive drive); static WINDOW *overwriteDetailViewWindow( int iXSize, int iYSize, int iXStart); @@ -67,6 +68,6 @@ private: void displaySelectedDrive(Drive drive, int stdscrX, int stdscrY); string formatTimeDuration(time_t u32Duration); string formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes); - + static void vTruncateText(string* psText, uint16_t u16MaxLenght); }; #endif // TUI_H_ \ No newline at end of file diff --git a/scripts/update.sh b/scripts/update.sh index c4479c0..166c037 100644 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -6,9 +6,9 @@ systemctl stop /lib/systemd/system/getty@tty1.service.d cd /root/reHDD/ -FILE=./ignoreDrives.conf +FILE=../ignoreDrives.conf if test -f "$FILE"; then - echo backup exits + echo "backup exits already" else cp /root/reHDD/ignoreDrives.conf /root/ignoreDrives.conf fi @@ -23,6 +23,12 @@ git checkout master git pull +git submodule init + +git submodule update + +make clean + make release cp /root/ignoreDrives.conf /root/reHDD/ignoreDrives.conf diff --git a/src/drive.cpp b/src/drive.cpp index f31367f..b2190a0 100644 --- a/src/drive.cpp +++ b/src/drive.cpp @@ -182,7 +182,7 @@ void Drive::checkFrozenDrive(void) if((u32localtime - this->u32Timestamp) >= (FROZEN_TIMEOUT*60) && (this->u32Timestamp > 0) && (this->getTaskPercentage() < 100.0)) { Logger::logThis()->warning("Drive Frozen: " + this->getModelName() + " " + this->getSerial()); - this->bWasDeleteted = false; + this->bWasDeleted = false; this->bWasShredded = false; this->state = Drive::FROZEN; } diff --git a/src/logger/logger.cpp b/src/logger/logger.cpp index 5708359..f77021d 100644 --- a/src/logger/logger.cpp +++ b/src/logger/logger.cpp @@ -18,8 +18,6 @@ Logger* Logger::single = NULL; /** * \brief create new logger instance - * \param path to log file - * \param struct with data * \return instance of Logger */ Logger::Logger() diff --git a/src/printer.cpp b/src/printer.cpp new file mode 100644 index 0000000..e8db0bb --- /dev/null +++ b/src/printer.cpp @@ -0,0 +1,83 @@ +/** + * @file printer.cpp + * @brief Send drive data to printer service using ipc msg queue + * @author Hendrik Schutter + * @date 24.11.2022 + */ + +#include "../include/reHDD.h" + +bool Printer::instanceFlag = false; +Printer* Printer::single = NULL; + +/** + * \brief create new Printer instance + * \param path to log file + * \param struct with data + * \return instance of Printer + */ +Printer::Printer() +{ + if (-1 == (this->msqid = msgget((key_t)IPC_MSG_QUEUE_KEY, IPC_CREAT | 0666))) + { + Logger::logThis()->error("Printer: Create mgs queue failed!"); + } +} + +/** + * \brief deconstructor + * \return void + */ +Printer::~Printer() +{ + instanceFlag = false; +} + +/** + * \brief send data to msg queue + * \return void + */ +void Printer::print(Drive* drive) +{ + t_msgQueueData msgQueueData; + msgQueueData.msg_queue_type = 1; + + sprintf(msgQueueData.driveData.caDriveIndex, "%i",42); //TODO: get from tui + sprintf(msgQueueData.driveData.caDriveState, "shredded"); + strcpy(msgQueueData.driveData.caDriveModelFamily, drive->getModelFamily().c_str()); + strcpy(msgQueueData.driveData.caDriveModelName, drive->getModelName().c_str()); + sprintf(msgQueueData.driveData.caDriveCapacity, "%li", drive->getCapacity()); + strcpy(msgQueueData.driveData.caDriveSerialnumber, drive->getSerial().c_str()); + sprintf(msgQueueData.driveData.caDriveHours, "%i",drive->getPowerOnHours()); + sprintf(msgQueueData.driveData.caDriveCycles, "%i",drive->getPowerCycles()); + sprintf(msgQueueData.driveData.caDriveErrors, "%i",drive->getErrorCount()); + sprintf(msgQueueData.driveData.caDriveShredTimestamp, "%li",drive->getActionStartTimestamp()); + sprintf(msgQueueData.driveData.caDriveShredDuration, "%li",drive->getTaskDuration()); + sprintf(msgQueueData.driveData.caDriveReHddVersion, REHDD_VERSION); + + if (-1 == msgsnd(this->msqid, &msgQueueData, sizeof(t_msgQueueData) - sizeof(long), 0)) + { + Logger::logThis()->error("Printer: Send mgs queue failed!"); + }else{ + Logger::logThis()->info("Printer: print triggered - Drive: " + drive->getSerial()); + } +} + + +/** + * \brief return a instance of the printer + * \return printer obj + */ +Printer* Printer::getPrinter() +{ + if (!instanceFlag) + { + single = new Printer(); //create new obj + instanceFlag = true; + return single; + } + else + { + return single; //return existing obj + } +} \ No newline at end of file diff --git a/src/reHDD.cpp b/src/reHDD.cpp index 5dcd2eb..4ed5f68 100644 --- a/src/reHDD.cpp +++ b/src/reHDD.cpp @@ -15,7 +15,7 @@ static std::mutex mxDrives; list listNewDrives; //store found drives that are updated every 5sec -static list listDrives; //stores all drive data from scann thread +static list listDrives; //stores all drive data from scan thread TUI *ui; @@ -46,7 +46,7 @@ void reHDD::app_logic(void) pipe(fdNewDrivesInformPipe); pipe(fdShredInformPipe); - thread thDevices(ThreadScannDevices); //start thread that scanns for drives + thread thDevices(ThreadScanDevices); //start thread that scans for drives thread thUserInput(ThreadUserInput); //start thread that reads user input thread thCheckFrozenDrives(ThreadCheckFrozenDrives); //start thread that checks timeout for drives @@ -75,10 +75,6 @@ void reHDD::app_logic(void) #ifdef LOG_LEVEL_HIGH Logger::logThis()->info("got progress signal from a shred task"); #endif - - - - } ui->updateTUI(&listDrives, u8SelectedEntry); } //endless loop @@ -102,7 +98,7 @@ Drive* reHDD::getSelectedDrive() } } -void reHDD::ThreadScannDevices() +void reHDD::ThreadScanDevices() { while(true) { @@ -225,7 +221,7 @@ void reHDD::ThreadDelete() getSelectedDrive()->setActionStartTimestamp(); //save timestamp at start of deleting Delete::deleteDrive(getSelectedDrive()); //blocking, no thread getSelectedDrive()->state = Drive::TaskState::NONE; //delete finished - getSelectedDrive()->bWasDeleteted = true; + getSelectedDrive()->bWasDeleted = true; Logger::logThis()->info("Finished delete for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial()); ui->updateTUI(&listDrives, u8SelectedEntry); } @@ -234,7 +230,7 @@ void reHDD::ThreadDelete() void reHDD::filterNewDrives(list * plistOldDrives, list * plistNewDrives) { list ::iterator itOld; //Iterator for current (old) drive list - list ::iterator itNew; //Iterator for new drive list that was created from to scann thread + list ::iterator itNew; //Iterator for new drive list that was created from to scan thread //remove offline old drives from previously run for (itOld = plistOldDrives->begin(); itOld != plistOldDrives->end();) @@ -267,9 +263,9 @@ void reHDD::filterNewDrives(list * plistOldDrives, list * plistNew //copy new smart data to existing drive itOld->setDriveSMARTData(itNew->getModelFamily(), itNew->getModelName(), itNew->getSerial(), itNew->getCapacity(), itNew->getErrorCount(), itNew->getPowerOnHours(), itNew->getPowerCycles(), itNew->getTemperature()); #ifdef LOG_LEVEL_HIGH - Logger::logThis()->info("Delete new drive, because allready attached: " + itNew->getModelName()); + Logger::logThis()->info("Delete new drive, because already attached: " + itNew->getModelName()); #endif - itNew = plistNewDrives->erase(itNew); //This drive is allready attached, remove from new list + itNew = plistNewDrives->erase(itNew); //This drive is already attached, remove from new list } else { @@ -338,15 +334,15 @@ void reHDD::searchDrives(list * plistDrives) */ void reHDD::filterIgnoredDrives(list * plistDrives) { - list> vtlIgnoredDevices; //store drives from ingnore file - ifstream input( "ignoreDrives.conf" ); //read ingnore file + list> vtlIgnoredDevices; //store drives from ignore file + ifstream input( "ignoreDrives.conf" ); //read ignore file for(string sLine; getline( input, sLine );) { //Logger::logThis()->info("read uuid: " + sLine); vtlIgnoredDevices.emplace_back(sLine); //add found path and uuid from ignore file to vector } - //loop through found entries in ingnore file + //loop through found entries in ignore file for(auto row : vtlIgnoredDevices) { list ::iterator it; @@ -531,7 +527,7 @@ void reHDD::handleEnter() { if(getSelectedDrive()->state == Drive::TaskState::SHRED_SELECTED) { - Logger::logThis()->info("Started shred for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial()); + Logger::logThis()->info("Started shred/check for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial()); getSelectedDrive()->state = Drive::TaskState::SHRED_ACTIVE; //task for drive is running --> don´t show more task options Drive* pTmpDrive = getSelectedDrive(); diff --git a/src/shred.cpp b/src/shred.cpp index aaf541f..65bf219 100644 --- a/src/shred.cpp +++ b/src/shred.cpp @@ -177,16 +177,20 @@ int Shred::shredDrive(Drive* drive, int* ipSignalFd) tfng_prng_seedkey(NULL); //reset random generator -#ifdef ZERO_CHECK_ALERT - drive->u32DriveChecksumAferShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd); + drive->bWasShredded = true; + Logger::logThis()->info("Shred-Task finished - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str()); +#ifdef ZERO_CHECK + 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->u32DriveChecksumAferShredding != 0) { - Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAferShredding) + " - Drive: " + drive->getSerial()); + Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial()); } else { - Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAferShredding) + " - Drive: " + drive->getSerial()); + Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial()); } #endif #endif @@ -194,12 +198,12 @@ int Shred::shredDrive(Drive* drive, int* ipSignalFd) cleanup(); - if(drive->state == Drive::SHRED_ACTIVE) + if((drive->state == Drive::SHRED_ACTIVE) || (drive->state == Drive::CHECK_ACTIVE)) { - drive->bWasShredded = true; drive->state= Drive::NONE; drive->setTaskPercentage(0.0); - Logger::logThis()->info("Finished shred for: " + drive->getModelName() + "-" + drive->getSerial()); + Printer::getPrinter()->print(drive); + Logger::logThis()->info("Finished shred/check for: " + drive->getModelName() + "-" + drive->getSerial()); } return 0; } @@ -213,7 +217,7 @@ double Shred::calcProgress() { unsigned int uiMaxShredIteration = SHRED_ITERATIONS; -#ifdef ZERO_CHECK_ALERT +#ifdef ZERO_CHECK uiMaxShredIteration++; //increment because we will check after SHRED_ITERATIONS the drive for non-zero bytes #endif return (double) (((double) ulDriveByteOverallCount) / ((double)this->ulDriveByteSize*uiMaxShredIteration))*100.0f; @@ -271,16 +275,22 @@ unsigned int Shred::uiCalcChecksum(fileDescriptor file,Drive* drive, int* ipSign ulDriveByteOverallCount += iReadBytes; d32Percent = this->calcProgress(); drive->sShredSpeed.ulSpeedMetricBytesWritten += iReadBytes; + #ifdef LOG_LEVEL_HIGH Logger::logThis()->info("Shred-Task (Checksum): ByteCount: " + to_string(ulDriveByteCounter) + " - progress: " + to_string(d32Percent) + " - Drive: " + drive->getSerial()); #endif - if((d32Percent-d32TmpPercent) >= 0.01) + + if(((d32Percent-d32TmpPercent) >= 0.01) || (d32Percent == 100.0)) { drive->setTaskPercentage(d32TmpPercent); d32TmpPercent = d32Percent; +#ifdef LOG_LEVEL_HIGH + Logger::logThis()->info("send progress signal to main loop (check)"); +#endif write(*ipSignalFd, "A",1); } } + drive->bWasChecked = true; return uiChecksum; } diff --git a/src/tui.cpp b/src/tui.cpp index 895c506..ae43f4a 100644 --- a/src/tui.cpp +++ b/src/tui.cpp @@ -11,6 +11,7 @@ static std::mutex mxUIrefresh; TUI::TUI(void) { + } /** @@ -41,8 +42,9 @@ void TUI::initTUI() init_pair(COLOR_AREA_STDSCR,COLOR_WHITE, COLOR_BLUE); wbkgd(stdscr, COLOR_PAIR(COLOR_AREA_STDSCR)); - init_pair(COLOR_AREA_ENTRY, COLOR_BLACK, COLOR_WHITE); - init_pair(COLOR_AREA_ENTRY_SELECTED, COLOR_BLACK, COLOR_RED); + 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_SELECTED, COLOR_WHITE, COLOR_RED); init_pair(COLOR_AREA_OVERVIEW, COLOR_BLACK, COLOR_WHITE); init_pair(COLOR_AREA_DETAIL, COLOR_BLACK, COLOR_WHITE); @@ -61,10 +63,12 @@ void TUI::updateTUI(list * plistDrives, uint8_t u8SelectedEntry) refresh(); - overview=createOverViewWindow((int)(u16StdscrX/3), (u16StdscrY-3)); + //overview window is 3/7 of the x-size + overview=createOverViewWindow((int)(u16StdscrX *(float)(3.0/7.0)), (u16StdscrY-1)); wrefresh(overview); - systemview=createSystemStats((int)(u16StdscrX/3), 10, u16StdscrX-(int)(u16StdscrX/3)-2, (u16StdscrY-11 )); + //system stat window is 2/7 of the x-size + systemview=createSystemStats(((int)(u16StdscrX *(float)(2.0/7.0)))-6, 12, (int)(u16StdscrX *(float)(5.0/7.0)+4), (u16StdscrY-13 )); wrefresh(systemview); delwin(detailview); @@ -105,6 +109,13 @@ void TUI::updateTUI(list * plistDrives, uint8_t u8SelectedEntry) stream << fixed << setprecision(3) << (it->getTaskPercentage()); sState = "Shredding: " + stream.str() + "%"; + it->calculateTaskDuration(); + sTime = this->formatTimeDuration(it->getTaskDuration()); + sSpeed = this->formatSpeed(it->sShredSpeed.u32ShredTimeDelta, it->sShredSpeed.ulWrittenBytes); + break; + case Drive::CHECK_ACTIVE: + stream << fixed << setprecision(3) << (it->getTaskPercentage()); + sState = "Checking: " + stream.str() + "%"; it->calculateTaskDuration(); sTime = this->formatTimeDuration(it->getTaskDuration()); sSpeed = this->formatSpeed(it->sShredSpeed.u32ShredTimeDelta, it->sShredSpeed.ulWrittenBytes); @@ -114,24 +125,32 @@ void TUI::updateTUI(list * plistDrives, uint8_t u8SelectedEntry) it->calculateTaskDuration(); sTime = this->formatTimeDuration(it->getTaskDuration()); break; - case Drive::NONE: case Drive::SHRED_SELECTED: case Drive::DELETE_SELECTED: - if (it->bWasDeleteted) + if (it->bWasDeleted) { sState = "DELETED"; //mark drive as deleted previously } if (it->bWasShredded) { - sState = "SHREDDED"; //mark drive as shreded previously, overwrite if deleted + if(it->bWasChecked) + { + //drive was also checked after shredding + sState = "SHREDDED & CHECKED"; //mark drive as shredded previously and optional checked + } + else + { + //shredded and not checked yet + sState = "SHREDDED"; //mark drive as shredded previously + } sTime = this->formatTimeDuration(it->getTaskDuration()); } -#ifdef ZERO_CHECK_ALERT - if(bSelectedEntry && it->bWasShredded && (it->u32DriveChecksumAferShredding != 0U)) +#ifdef ZERO_CHECK + if(bSelectedEntry && it->bWasChecked && (it->u32DriveChecksumAfterShredding != 0U)) { - dialog=createZeroChecksumWarning(70, 16, ((u16StdscrX)-(int)(u16StdscrX/2)-20),(int)(u16StdscrY/2)-8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial(), it->u32DriveChecksumAferShredding); + 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); } #endif @@ -152,7 +171,9 @@ void TUI::updateTUI(list * plistDrives, uint8_t u8SelectedEntry) break; } - WINDOW * tmp = createEntryWindow( ((int)(u16StdscrX/3) - 2), 5, 3, (5* (u8Index) )+3, (distance(plistDrives->begin(), it)+1), sModelFamily, sSerial, sCapacity, sState, sTime, sSpeed, sTemp, bSelectedEntry); + 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, bSelectedEntry); wrefresh(tmp); u8Index++; }//end loop though drives @@ -168,11 +189,11 @@ void TUI::updateTUI(list * plistDrives, uint8_t u8SelectedEntry) menustate.bDelete = false; menustate.bShred = false; - menuview=createMenuView(((int)(u16StdscrX/3)-10 ), 10, (int)(u16StdscrX/3)+5,(u16StdscrY-11), menustate); - wrefresh(menuview); - - detailview=overwriteDetailViewWindow(((u16StdscrX)-(int)(u16StdscrX/3)-7), (u16StdscrY-15), (int)(u16StdscrX/3)+5); + detailview=overwriteDetailViewWindow((u16StdscrX)-((int)(u16StdscrX *(float)(3.0/7.0)))-7, (u16StdscrY-15), (int)(u16StdscrX *(float)(3.0/7.0)+5)); wrefresh(detailview); + + menuview=createMenuView(((int)(u16StdscrX *(float)(2.0/7.0)))-3, 12, (int)(u16StdscrX *(float)(3.0/7.0)+5),(u16StdscrY-13), menustate); + wrefresh(menuview); } mxUIrefresh.unlock(); @@ -227,10 +248,13 @@ void TUI::centerTitle(WINDOW *pwin, const char * title) waddch(pwin, ACS_LTEE); } +/* +left window that contains the drive entries +*/ WINDOW* TUI::createOverViewWindow( int iXSize, int iYSize) { WINDOW *newWindow; - newWindow = newwin(iYSize, iXSize, 2, 2); + newWindow = newwin(iYSize, iXSize, 1, 2); wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_OVERVIEW)); box(newWindow, ACS_VLINE, ACS_HLINE); @@ -243,7 +267,7 @@ WINDOW* TUI::createOverViewWindow( int iXSize, int iYSize) WINDOW* TUI::createDetailViewWindow( int iXSize, int iYSize, int iXStart, Drive drive) { WINDOW *newWindow; - newWindow = newwin(iYSize, iXSize, 2, iXStart); + newWindow = newwin(iYSize, iXSize, 1, iXStart); wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_DETAIL)); box(newWindow, ACS_VLINE, ACS_HLINE); @@ -251,7 +275,7 @@ WINDOW* TUI::createDetailViewWindow( int iXSize, int iYSize, int iXStart, Drive centerTitle(newWindow, title.c_str()); string sPath = "Path: " +drive.getPath(); - string sModelFamlily = "ModelFamily: " + drive.getModelFamily(); + string sModelFamily = "ModelFamily: " + drive.getModelFamily(); string sModelName = "ModelName: " + drive.getModelName(); string sCapacity = "Capacity: " + drive.sCapacityToText(); string sSerial = "Serial: " + drive.getSerial(); @@ -262,7 +286,7 @@ WINDOW* TUI::createDetailViewWindow( int iXSize, int iYSize, int iXStart, Drive uint16_t u16Line = 2; mvwaddstr(newWindow,u16Line++, 3, sPath.c_str()); - mvwaddstr(newWindow,u16Line++, 3, sModelFamlily.c_str()); + mvwaddstr(newWindow,u16Line++, 3, sModelFamily.c_str()); mvwaddstr(newWindow,u16Line++, 3, sModelName.c_str()); mvwaddstr(newWindow,u16Line++, 3, sCapacity.c_str()); mvwaddstr(newWindow,u16Line++, 3, sSerial.c_str()); @@ -279,7 +303,7 @@ WINDOW* TUI::createDetailViewWindow( int iXSize, int iYSize, int iXStart, Drive WINDOW* TUI::overwriteDetailViewWindow( int iXSize, int iYSize, int iXStart) { WINDOW *newWindow; - newWindow = newwin(iYSize, iXSize, 2, iXStart); + newWindow = newwin(iYSize, iXSize, 1, iXStart); wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_DETAIL)); box(newWindow, ACS_VLINE, ACS_HLINE); @@ -291,7 +315,7 @@ WINDOW* TUI::overwriteDetailViewWindow( int iXSize, int iYSize, int iXStart) string sLine03 = "Available under GPL 3.0"; string sLine04 = "https://git.mosad.xyz/localhorst/reHDD"; string sLine05 = "Delete: Wipe format table - this is NOT secure"; - string sLine06 = "Shred: Overwite drive " + to_string(SHRED_ITERATIONS) + " iterations - this is secure"; + string sLine06 = "Shred: Overwrite drive " + to_string(SHRED_ITERATIONS) + " iterations - this is secure"; uint16_t u16Line = 5; @@ -317,28 +341,65 @@ WINDOW* TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, if(!bSelected) { // entry is NOT selected - attron(COLOR_PAIR(COLOR_AREA_ENTRY)); - wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY)); + if(iListIndex % 2 == 0) + { + //even + attron(COLOR_PAIR(COLOR_AREA_ENTRY_EVEN)); + wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY_EVEN)); + } + else + { + //odd + attron(COLOR_PAIR(COLOR_AREA_ENTRY_ODD)); + wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY_ODD)); + } } else { // entry IS selected - attron(COLOR_PAIR(COLOR_AREA_ENTRY)); + attron(COLOR_PAIR(COLOR_AREA_ENTRY_SELECTED)); wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY_SELECTED)); } - box(newWindow, ACS_VLINE, ACS_HLINE); + //box(newWindow, ACS_VLINE, ACS_HLINE); - mvwaddstr(newWindow,1, 1, to_string(iListIndex).c_str()); + //index number + mvwaddstr(newWindow,0, 1, to_string(iListIndex).c_str()); - mvwaddstr(newWindow,1, 5, sModelFamily.c_str()); - mvwaddstr(newWindow,2, 5, sSerial.c_str()); - mvwaddstr(newWindow,3, 5, sCapacity.c_str()); - mvwaddstr(newWindow,3, 5+sCapacity.length()+3, sTemp.c_str()); + /* + 70 chars in x-axis - mvwaddstr(newWindow,1, iXSize-sSpeed.length()-5, sSpeed.c_str()); - mvwaddstr(newWindow,2, iXSize-sState.length()-5, sState.c_str()); - mvwaddstr(newWindow,3, iXSize-sTime.length()-5, sTime.c_str()); + line:01 + 0: space + 1: index number + 2: space + 3-35: ModelFamily + 36: space + 37-43: Capacity + 44: space + 47-49: Temp + + line:02 + 0-2: space + 3-31: Serial + 32: space + 33-45: Speed + 46: space + 47-58: Time + 59: space + 60-70: State (but right side aligned) + */ + + vTruncateText(&sModelFamily, 32); + mvwaddstr(newWindow, 0, 3, sModelFamily.c_str()); + mvwaddstr(newWindow, 0, 37, sCapacity.c_str()); + mvwaddstr(newWindow, 0, 47, sTemp.c_str()); + + vTruncateText(&sSerial, 28); + mvwaddstr(newWindow, 1, 3, sSerial.c_str()); + mvwaddstr(newWindow, 1, 33, sSpeed.c_str()); + mvwaddstr(newWindow, 1, 47, sTime.c_str()); + mvwaddstr(newWindow, 1, iXSize - sState.length() - 2, sState.c_str()); return newWindow; } @@ -373,6 +434,7 @@ WINDOW* TUI::createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart) uint16_t u16Line = 2; mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine01.c_str()); + u16Line++; mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine02.c_str()); mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine03.c_str()); mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine04.c_str()); @@ -393,7 +455,7 @@ WINDOW* TUI::createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, st centerTitle(newWindow, "Controls"); - uint16_t u16Line = 2; + uint16_t u16Line = 4; if(menustate.bAbort) { @@ -482,7 +544,7 @@ WINDOW* TUI::createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int string sLine01 = "Please detach this drive and check it manually:"; string sShredChecksum = "After shredding the checksum was: " + to_string(u32Checksum); string sLinePath = "Path: " +sPath; - string sLineModelFamlily = "ModelFamily: " + sModelFamily; + string sLineModelFamily = "ModelFamily: " + sModelFamily; string sLineModelName = "ModelName: " + sModelName; string sLineSerial = "Serial: " + sSerial; @@ -495,7 +557,7 @@ WINDOW* TUI::createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int mvwaddstr(newWindow,u16Line++, 3, sLine01.c_str()); u16Line++; mvwaddstr(newWindow,u16Line++, 3, sLinePath.c_str()); - mvwaddstr(newWindow,u16Line++, 3, sLineModelFamlily.c_str()); + mvwaddstr(newWindow,u16Line++, 3, sLineModelFamily.c_str()); mvwaddstr(newWindow,u16Line++, 3, sLineModelName.c_str()); mvwaddstr(newWindow,u16Line++, 3, sLineSerial.c_str()); u16Line++; @@ -530,6 +592,15 @@ string TUI::formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes) return out.str(); } +void TUI::vTruncateText(string* psText, uint16_t u16MaxLenght) +{ + if (psText->length() > u16MaxLenght) + { + psText->resize(u16MaxLenght-3); + *psText = *psText + "..."; + } +} + void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY) { struct MenuState menustate; @@ -554,6 +625,10 @@ void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY) menustate.bAbort = true; break; + case Drive::CHECK_ACTIVE : //check task running for this drive + menustate.bAbort = true; + break; + case Drive::DELETE_SELECTED : //delete task selected for this drive menustate.bConfirmDelete = true; break; @@ -565,10 +640,10 @@ void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY) break; } - detailview=createDetailViewWindow(((stdscrX)-(int)(stdscrX/3)-7), (stdscrY-15), (int)(stdscrX/3)+5, drive); + detailview=createDetailViewWindow((stdscrX)-((int)(stdscrX *(float)(3.0/7.0)))-7, (stdscrY-15), (int)(stdscrX *(float)(3.0/7.0)+5), drive); wrefresh(detailview); - menuview=createMenuView(((int)(stdscrX/3)-10 ), 10, (int)(stdscrX/3)+5,(stdscrY-11), menustate); + menuview=createMenuView(((int)(stdscrX *(float)(2.0/7.0)))-3, 12, (int)(stdscrX *(float)(3.0/7.0)+5),(stdscrY-13), menustate); wrefresh(menuview); if(menustate.bConfirmShred == true) @@ -620,7 +695,7 @@ WINDOW* TUI::createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart if(u32ErrorCount > 0) { - string sLineTmp = "S.M.A.R.T. erros detected: " + to_string(u32ErrorCount); + string sLineTmp = "S.M.A.R.T. errors detected: " + to_string(u32ErrorCount); mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLineTmp.c_str()); u16Line++; } @@ -631,4 +706,4 @@ WINDOW* TUI::createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLineTmp.c_str()); } return newWindow; -} \ No newline at end of file +}