README.md

@@ -1,20 +1,12 @@
 # reHDD
 
-## Features:
+## Useful for:
-* show S.M.A.R.T values of attached drives
+* checking new drives for the first time
-* checking used drives for their next live based on threshold limits
+* checking used drives for their next live
-* 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 ##
-See reHDD-Bootable how the live image created: https://git.mosad.xyz/localhorst/reHDD-Bootable
-
-Use [Etcher](https://www.balena.io/etcher/#download) or `dd` to create an bootable USB drive .
 
 ## Screenshot 
-![Screenshot of reHDD with multiple drives in different states](https://git.mosad.xyz/localhorst/reHDD/raw/commit/c40dfe2cbb8f86490b49caf82db70a10015f06f9/doc/screenshot.png "Screenshot")
+![alt text](https://git.mosad.xyz/localhorst/reHDD/raw/commit/42bc26eac95429e20c0f0d59f684dfec0d600e75/doc/screenshot.png "Screenshot")
 
 ## Debian Build Notes
 
@@ -23,11 +15,6 @@ Use [Etcher](https://www.balena.io/etcher/#download) or `dd` to create an bootab
 * `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.
@@ -39,6 +26,7 @@ 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/

astyle.sh

@@ -0,0 +1,17 @@
+#! /bin/bash
+
+echo starting astyle for $PWD
+
+astyle --style=gnu src/*.cpp
+rm -f src/*.orig
+
+astyle --style=gnu src/logger/*.cpp
+rm -f src/logger/*.orig
+
+astyle --style=gnu include/*.h
+rm -f include/*.orig
+
+astyle --style=gnu include/logger/*.h
+rm -f include//logger/*.orig
+
+echo finished astyle for $PWD

include/delete.h

@@ -13,11 +13,13 @@
 class Delete
 {
 protected:
+
 public:
     static void deleteDrive(Drive* drive);
 
 private:
     Delete(void);
+
 };
 
 #endif  // DELETE_H_

include/drive.h

@@ -14,25 +14,14 @@ class Drive
 {
 
 public:
-    enum TaskState
+    enum TaskState {NONE,
-    {
-        NONE,
                     SHRED_SELECTED,
-        SHRED_ACTIVE, // shred iterations active
+                    SHRED_ACTIVE,
-        CHECK_ACTIVE, // optional checking active
                     DELETE_SELECTED,
                     DELETE_ACTIVE,
                     FROZEN
                    } state;
 
-    enum ConnectionType
-    {
-        UNKNOWN,
-        USB,
-        SATA,
-        NVME
-    } connectionType;
-
     struct
     {
         time_t u32ShredTimeDelta;
@@ -41,12 +30,10 @@ public:
         unsigned long ulSpeedMetricBytesWritten;
     } sShredSpeed;
 
-    bool bWasShredded = false;     // all shred iterations done
+    bool bWasShredded = false;
-    bool bWasShredStarted = false; // shred was atleast once started
+    bool bWasDeleteted = false;
-    bool bWasChecked = false;      // all shred iterations and optional checking done
-    bool bWasDeleted = false;
     bool bIsOffline = false;
-    uint32_t u32DriveChecksumAfterShredding = 0U;
+    uint32_t u32DriveChecksumAferShredding = 0U;
 
 private:
     string sPath;
@@ -71,6 +58,7 @@ private:
     void setTimestamp();
 
 protected:
+
 public:
     Drive(string path)
     {
@@ -111,6 +99,7 @@ public:
 
     void calculateTaskDuration();
     time_t getTaskDuration();
+
 };
 
 #endif  // DRIVE_H_

include/logger/logger.h

@@ -68,6 +68,7 @@ private:
     ~Logger();
 
 public:
+
     void info(string s);
     void warning(string s);
     void error(string s);

include/printer.h

@@ -1,56 +0,0 @@
-/**
- * @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 <sys/ipc.h>
-#include <sys/msg.h>
-
-#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_

include/reHDD.h

@@ -8,7 +8,7 @@
 #ifndef REHDD_H_
 #define REHDD_H_
 
-#define REHDD_VERSION "V1.2.0"
+#define REHDD_VERSION "bV0.3.0"
 
 // Drive handling Settings
 #define WORSE_HOURS   19200 //mark drive if at this limit or beyond
@@ -20,9 +20,9 @@
 
 // Logger Settings
 #define LOG_PATH "./reHDD.log"
-#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2025"
+#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2022"
 #define DEVICE_ID  "generic"
-#define SOFTWARE_VERSION REHDD_VERSION
+#define SOFTWARE_VERSION  "alpha"
 #define HARDWARE_VERSION  "generic"
 
 //#define LOG_LEVEL_HIGH  //log everything, like drive scan thread
@@ -31,9 +31,9 @@
 #endif
 
 // 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 ZERO_CHECK   // check drive after shred if all bytes are zero, show alert if this fails
+#define ZERO_CHECK_ALERT //check drive after shred if all bytes are zero, show alert if this fails
 
 //IPC pipes
 #define READ 0
@@ -64,13 +64,11 @@ using namespace std;
 #include "shred.h"
 #include "delete.h"
 #include "tui.h"
-#include "printer.h"
 #include "logger/logger.h"
 
 extern Logger* logging;
 
-template <typename T, typename I>
+template <typename T, typename I> T* iterator_to_pointer(I i)
-T *iterator_to_pointer(I i)
 {
     return (&(*i));
 }
@@ -78,21 +76,21 @@ T *iterator_to_pointer(I i)
 class reHDD
 {
 protected:
+
 public:
     reHDD(void);
     static void app_logic();
 
 private:
+
     static void searchDrives(list <Drive>* plistDrives);
     static void printDrives(list <Drive>* plistDrives);
     static void startShredAllDrives(list <Drive>* plistDrives);
-    static void stopShredAllDrives(list<Drive> *plistDrives);
     static void updateShredMetrics(list <Drive>* plistDrives);
     static void filterIgnoredDrives(list <Drive>* plistDrives);
-    static void filterInvalidDrives(list<Drive> *plistDrives);
     static void filterNewDrives(list <Drive>* plistOldDrives, list <Drive>* plistNewDrives);
     static void addSMARTData(list <Drive>* plistDrives);
-    static void ThreadScanDevices();
+    static void ThreadScannDevices();
     static void ThreadUserInput();
     static void ThreadShred(Drive* const pDrive);
     static void ThreadDelete();
@@ -102,7 +100,6 @@ private:
     static void handleESC();
     static void handleAbort();
     static Drive* getSelectedDrive();
-    static bool getSystemDrive(string &systemDrive);
 };
 
 #endif  // REHDD_H_

include/shred.h

@@ -17,6 +17,7 @@
 #include <unistd.h>
 #include <string.h>
 
+
 #define CHUNK_SIZE 1024*1024*32 //amount of bytes that are overwritten at once --> 32MB
 #define TFNG_DATA_SIZE CHUNK_SIZE //amount of bytes used by tfng
 
@@ -30,7 +31,9 @@ typedef int fileDescriptor;
 class Shred
 {
 protected:
+
 public:
+
     Shred();
     ~Shred();
     int shredDrive(Drive* drive, int* ipSignalFd);
@@ -50,6 +53,7 @@ private:
     unsigned long getDriveSizeInBytes(fileDescriptor file);
     unsigned int uiCalcChecksum(fileDescriptor file, Drive* drive, int* ipSignalFd);
     void cleanup();
+
 };
 
 #endif  // SHRED_H_

include/smart.h

@@ -13,21 +13,30 @@
 class SMART
 {
 protected:
+
 public:
     static void readSMARTData(Drive* drive);
 
 private:
     SMART(void);
 
-    static bool parseExitStatus(string sLine, uint8_t &status);
+    static void parseModelFamily(string sLine);
-    static bool parseModelFamily(string sLine, string &modelFamily);
+    static void parseModelName(string sLine);
-    static bool parseModelName(string sLine, string &modelName);
+    static void parseSerial(string sLine);
-    static bool parseSerial(string sLine, string &serial);
+    static void parseCapacity(string sLine);
-    static bool parseCapacity(string sLine, uint64_t &capacity);
+    static void parseErrorCount(string sLine);
-    static bool parseErrorCount(string sLine, uint32_t &errorCount);
+    static void parsePowerOnHours(string sLine);
-    static bool parsePowerOnHours(string sLine, uint32_t &powerOnHours);
+    static void parsePowerCycle(string sLine);
-    static bool parsePowerCycles(string sLine, uint32_t &powerCycles);
+    static void parseTemperature(string sLine);
-    static bool parseTemperature(string sLine, uint32_t &temperature);
+
+    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_

include/tui.h

@@ -12,28 +12,17 @@
 
 #define COLOR_AREA_STDSCR 1
 #define COLOR_AREA_OVERVIEW 2
-#define COLOR_AREA_ENTRY_EVEN 3
+#define COLOR_AREA_ENTRY 3
-#define COLOR_AREA_ENTRY_ODD 4
+#define COLOR_AREA_ENTRY_SELECTED 4
-#define COLOR_AREA_ENTRY_SELECTED 5
+#define COLOR_AREA_DETAIL 5
-#define COLOR_AREA_DETAIL 6
 
 class TUI
 {
 protected:
+
 public:
-    enum UserInput
+
-    {
+    enum UserInput { UpKey, DownKey, Abort, Shred, ShredAll, Delete, Enter, ESC, Undefined};
-        UpKey,
-        DownKey,
-        Abort,
-        Shred,
-        ShredAll,
-        Delete,
-        Enter,
-        ESC,
-        Terminate,
-        Undefined
-    };
     struct MenuState
     {
         bool bAbort;
@@ -67,7 +56,7 @@ private:
     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);
-    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 *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);
@@ -78,6 +67,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_

makefile

@@ -10,9 +10,9 @@ SRC_PATH = src
 # Space-separated pkg-config libraries used by this project
 LIBS = lib
 # General compiler flags
-COMPILE_FLAGS = -std=c++23 -Wall -Wextra -g
+COMPILE_FLAGS = -std=c++17 -Wall -Wextra -g
 # Additional release-specific flags
-RCOMPILE_FLAGS = -D NDEBUG -Ofast
+RCOMPILE_FLAGS = -D NDEBUG -O3
 # Additional debug-specific flags
 DCOMPILE_FLAGS = -D DEBUG
 # Add additional include paths

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 already"
+   echo backup exits
 else
     cp /root/reHDD/ignoreDrives.conf /root/ignoreDrives.conf
 fi
@@ -23,12 +23,6 @@ git checkout master
 
 git pull
 
-git submodule init
-
-git submodule update
-
-make clean
-
 make release
 
 cp  /root/ignoreDrives.conf /root/reHDD/ignoreDrives.conf

src/delete.cpp

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

src/drive.cpp

@@ -98,8 +98,7 @@ string Drive::sPowerCyclesToText()
 
 string Drive::sTemperatureToText()
 {
-    return to_string(getTemperature()) + " C";
+    return to_string(getTemperature())+" C";;
-    ;
 }
 
 void Drive::setTaskPercentage(double d32TaskPercentage)
@@ -115,6 +114,7 @@ double Drive::getTaskPercentage(void)
     return this->d32TaskPercentage;
 }
 
+
 /**
  * \brief   set S.M.A.R.T. values in model
  * \param	string modelFamily
@@ -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->bWasDeleted = false;
+            this->bWasDeleteted = false;
             this->bWasShredded = false;
             this->state = Drive::FROZEN;
         }

src/logger/logger.cpp

@@ -5,6 +5,7 @@
  * @date    04.09.2020
  */
 
+
 #include "../../include/reHDD.h" //for logger settings
 #include "../../include/logger/logger.h"
 
@@ -17,6 +18,8 @@ Logger *Logger::single = NULL;
 
 /**
  * \brief   create new logger instance
+ * \param	path to log file
+ * \param	struct with data
  * \return  instance of Logger
  */
 Logger::Logger()
@@ -152,6 +155,7 @@ string Logger::getMacAddress()
     if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
         {
             strcpy(ifr.ifr_name, "eno1");
+
         }
 
     unsigned char *hwaddr = (unsigned char *)ifr.ifr_hwaddr.sa_data;
@@ -227,3 +231,5 @@ Logger *Logger::logThis()
             return single; //return existing obj
         }
 }
+
+

src/printer.cpp

@@ -1,84 +0,0 @@
-/**
- * @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
-    }
-}

src/reHDD.cpp

@@ -15,7 +15,7 @@ static std::mutex mxDrives;
 
 list <Drive> listNewDrives; //store found drives that are updated every 5sec
 
-static list<Drive> listDrives; // stores all drive data from scan thread
+static list <Drive> listDrives; //stores all drive data from scann thread
 
 TUI *ui;
 
@@ -46,7 +46,7 @@ void reHDD::app_logic(void)
     pipe(fdNewDrivesInformPipe);
     pipe(fdShredInformPipe);
 
-    thread thDevices(ThreadScanDevices);                 // start thread that scans for drives
+    thread thDevices(ThreadScannDevices); //start thread that scanns for drives
     thread thUserInput(ThreadUserInput); //start thread that reads user input
     thread thCheckFrozenDrives(ThreadCheckFrozenDrives); //start thread that checks timeout for drives
 
@@ -75,6 +75,10 @@ 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
@@ -98,7 +102,7 @@ Drive *reHDD::getSelectedDrive()
         }
 }
 
-void reHDD::ThreadScanDevices()
+void reHDD::ThreadScannDevices()
 {
     while(true)
         {
@@ -107,7 +111,6 @@ void reHDD::ThreadScanDevices()
             searchDrives(&listNewDrives);           //search for new drives and store them in list
             filterIgnoredDrives(&listNewDrives);    //filter out ignored drives
             addSMARTData(&listNewDrives);           //add S.M.A.R.T. Data to the drives
-        filterInvalidDrives(&listNewDrives); // filter out drives that report zero capacity
             mxDrives.unlock();
             write(fdNewDrivesInformPipe[1], "A",1);
             sleep(5); //sleep 5 sec
@@ -197,12 +200,6 @@ void reHDD::ThreadUserInput()
                     handleESC();
                     ui->updateTUI(&listDrives, u8SelectedEntry);
                     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:
                     break;
                 }
@@ -228,7 +225,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()->bWasDeleted = true;
+            getSelectedDrive()->bWasDeleteted = true;
             Logger::logThis()->info("Finished delete for: " + getSelectedDrive()->getModelName() + "-" +  getSelectedDrive()->getSerial());
             ui->updateTUI(&listDrives, u8SelectedEntry);
         }
@@ -237,7 +234,7 @@ void reHDD::ThreadDelete()
 void reHDD::filterNewDrives(list <Drive>* plistOldDrives, list <Drive>* plistNewDrives)
 {
     list <Drive>::iterator itOld; //Iterator for current (old) drive list
-    list<Drive>::iterator itNew; // Iterator for new drive list that was created from to scan thread
+    list <Drive>::iterator itNew; //Iterator for new drive list that was created from to scann thread
 
     //remove offline old drives from previously run
     for (itOld = plistOldDrives->begin(); itOld != plistOldDrives->end();)
@@ -270,9 +267,9 @@ void reHDD::filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDr
                             //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 already attached: " + itNew->getModelName());
+                            Logger::logThis()->info("Delete new drive, because allready attached: " + itNew->getModelName());
 #endif
-                itNew = plistNewDrives->erase(itNew); // This drive is already attached, remove from new list
+                            itNew = plistNewDrives->erase(itNew); //This drive is allready attached, remove from new list
                         }
                     else
                         {
@@ -306,51 +303,32 @@ void reHDD::filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDr
  * \param	pointer of list <Drive>* plistDrives
  * \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 -I 8 -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);
         }
 
-    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));
-
-        if (devName.empty())
-            continue;
-
-        Drive *tmpDrive = new Drive("/dev/" + devName);
                     tmpDrive->state = Drive::NONE;
                     tmpDrive->bIsOffline = false;
-
-        // 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());
-        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(fp);
+    pclose(outputfileHwinfo);
 }
 
 /**
@@ -360,35 +338,15 @@ void reHDD::searchDrives(std::list<Drive> *plistDrives)
  */
 void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
 {
-    string systemDrivePath;
+    list<tuple<string>> vtlIgnoredDevices; //store drives from ingnore file
-    if (getSystemDrive(systemDrivePath))
+    ifstream input( "ignoreDrives.conf" ); //read ingnore file
-    {
-        // 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
-    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 ignore file
+    //loop through found entries in ingnore file
     for(auto row : vtlIgnoredDevices)
         {
             list <Drive>::iterator it;
@@ -433,27 +391,6 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
         }
 }
 
-/**
- * \brief   filter out drives that are not indented for processing
- * \param	pointer of list <Drive>* plistDrives
- * \return  void
- */
-void reHDD::filterInvalidDrives(list<Drive> *plistDrives)
-{
-    list<Drive>::iterator it;
-    for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-    {
-        if (it->getCapacity() == 0U)
-        {
-#ifdef LOG_LEVEL_HIGH
-            Logger::logThis()->info("Drive reports zero capacity --> ignore this drive: " + it->getPath());
-#endif
-            it = plistDrives->erase(it);
-            it--;
-        }
-    }
-}
-
 /**
  * \brief   start shred for all drives
  * \param	pointer of list <Drive>* plistDrives
@@ -480,34 +417,6 @@ void reHDD::startShredAllDrives(list<Drive> *plistDrives)
     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
  * \param	pointer of list <Drive>* plistDrives
@@ -622,9 +531,9 @@ void reHDD::handleEnter()
         {
             if(getSelectedDrive()->state == Drive::TaskState::SHRED_SELECTED)
                 {
-            Logger::logThis()->info("Started shred/check for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
+                    Logger::logThis()->info("Started shred for: " + getSelectedDrive()->getModelName() + "-" +  getSelectedDrive()->getSerial());
                     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();
                     thread(ThreadShred, pTmpDrive).detach();
                 }
@@ -633,7 +542,7 @@ void reHDD::handleEnter()
                 {
                     Logger::logThis()->info("Started delete for: " + getSelectedDrive()->getModelName() + "-" +  getSelectedDrive()->getSerial());
                     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();
                 }
         }
@@ -670,58 +579,5 @@ 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;
-}

src/shred.cpp

@@ -8,8 +8,7 @@
 #include "../include/reHDD.h"
 
 #ifdef __cplusplus
-extern "C"
+extern "C" {
-{
 #endif
 #include "../tfnoisegen/tfprng.h"
 #ifdef __cplusplus
@@ -36,7 +35,6 @@ 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++)
@@ -49,7 +47,6 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
             write(*ipSignalFd, "A",1);
             usleep(20000);
         }
-    drive->bWasShredded = true;
 #endif
 
 #ifndef DRYRUN
@@ -92,7 +89,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
     tfng_prng_seedkey(ucKey);
 
     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
 
 #ifdef LOG_LEVEL_HIGH
@@ -180,20 +177,16 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
 
     tfng_prng_seedkey(NULL); //reset random generator
 
-    drive->bWasShredded = true;
+#ifdef ZERO_CHECK_ALERT
-    Logger::logThis()->info("Shred-Task finished - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
+    drive->u32DriveChecksumAferShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd);
-#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->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->u32DriveChecksumAferShredding) + " - Drive: " + drive->getSerial());
         }
     else
         {
-        Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
+            Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAferShredding) + " - Drive: " + drive->getSerial());
         }
 #endif
 #endif
@@ -201,12 +194,12 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
 
     cleanup();
 
-    if ((drive->state == Drive::SHRED_ACTIVE) || (drive->state == Drive::CHECK_ACTIVE))
+    if(drive->state == Drive::SHRED_ACTIVE)
         {
+            drive->bWasShredded = true;
             drive->state= Drive::NONE;
             drive->setTaskPercentage(0.0);
-        Printer::getPrinter()->print(drive);
+            Logger::logThis()->info("Finished shred for: " + drive->getModelName() + "-" +  drive->getSerial());
-        Logger::logThis()->info("Finished shred/check for: " + drive->getModelName() + "-" + drive->getSerial());
         }
     return 0;
 }
@@ -220,7 +213,7 @@ double Shred::calcProgress()
 {
     unsigned int uiMaxShredIteration = SHRED_ITERATIONS;
 
-#ifdef ZERO_CHECK
+#ifdef ZERO_CHECK_ALERT
     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;
@@ -278,22 +271,16 @@ unsigned int Shred::uiCalcChecksum(fileDescriptor file, Drive *drive, int *ipSig
             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;
 }
 

src/smart.cpp

@@ -7,6 +7,15 @@
 
 #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
  * \param	pointer of Drive instance
@@ -14,138 +23,81 @@
  */
 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();
     modelName.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 "};
+    size_t len = 0; //lenght of found line
+    char* cLine = NULL; //found line
 
-    for (string sSmartctlCommand : sSmartctlCommands)
+    string sCMD = ("smartctl --json -a ");
-    {
-        string sCMD = ("smartctl");
-        sCMD.append(sSmartctlCommand);
     sCMD.append(drive->getPath());
     const char* cpComand = sCMD.c_str();
 
-        //Logger::logThis()->info(cpComand);
-
     FILE* outputfileSmart = popen(cpComand, "r");
-        size_t len = 0U;     // length of found line
-        char *cLine = NULL; // found line
-        uint8_t status = 255U;
 
     while ((getline(&cLine, &len, outputfileSmart)) != -1)
         {
             string sLine = string(cLine);
 
-            SMART::parseExitStatus(sLine, status);
+            SMART::parseModelFamily(sLine);
-            SMART::parseModelFamily(sLine, modelFamily);
+            SMART::parseModelName(sLine);
-            SMART::parseModelName(sLine, modelName);
+            SMART::parseSerial(sLine);
-            SMART::parseSerial(sLine, serial);
+            SMART::parseCapacity(sLine);
-            SMART::parseCapacity(sLine, capacity);
+            SMART::parseErrorCount(sLine);
-            SMART::parseErrorCount(sLine, errorCount);
+            SMART::parsePowerOnHours(sLine);
-            SMART::parsePowerOnHours(sLine, powerOnHours);
+            SMART::parsePowerCycle(sLine);
-            SMART::parsePowerCycles(sLine, powerCycles);
+            SMART::parseTemperature(sLine);
-            SMART::parseTemperature(sLine, temperature);
         }
-
     pclose(outputfileSmart);
-
+    drive->setDriveSMARTData(modelFamily, modelName, serial, capacity, errorCount, powerOnHours, powerCycle, temperature); //wirte data in drive
-        if (status == 0U)
-        {
-            // Found S.M.A.R.T. data with this command
-            //Logger::logThis()->info("Found S.M.A.R.T. data with this command");
-            break;
-        }
-    }
-
-    drive->setDriveSMARTData(modelFamily, modelName, serial, capacity, errorCount, powerOnHours, powerCycles, temperature); // write data in drive
 }
 
 /**
- * \brief parse ExitStatus
+ * \brief   parse ModelFamiliy
  * \param	string output line of smartctl
- * \param uint8_t parsed status
+ * \return  void
- * \return bool if parsing was possible
  */
-bool SMART::parseExitStatus(string sLine, uint8_t &status)
+void SMART::parseModelFamily(string sLine)
-{
-    string search("\"exit_status\": ");
-    size_t found = sLine.find(search);
-    if (found != string::npos)
-    {
-        sLine.erase(0U, sLine.find(": ") + 1U);
-        status = stol(sLine);
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-/**
- * \brief parse ModelFamily
- * \param string output line of smartctl
- * \param string parsed model family
- * \return bool if parsing was possible
- */
-bool SMART::parseModelFamily(string sLine, string &modelFamily)
 {
     string search("\"model_family\": ");
     size_t found = sLine.find(search);
     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;
-        return true;
-    }
-    else
-    {
-        return false;
         }
 }
 
 /**
  * \brief   parse ModelName
  * \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\": ");
     size_t found = sLine.find(search);
     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;
-        return true;
-    }
-    else
-    {
-        return false;
         }
 }
 
 /**
  * \brief   parse Serial
  * \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\": ");
     size_t found = sLine.find(search);
@@ -154,21 +106,15 @@ bool SMART::parseSerial(string sLine, string &serial)
             sLine.erase(0, sLine.find(": ") + 3);
             sLine.erase(sLine.length()-3, 3);
             serial = sLine;
-        return true;
-    }
-    else
-    {
-        return false;
         }
 }
 
 /**
  * \brief   parse Capacity
  * \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\": ");
     size_t found = sLine.find(search);
@@ -177,67 +123,50 @@ bool SMART::parseCapacity(string sLine, uint64_t &capacity)
             sLine.erase(0, sLine.find(": ") + 2);
             sLine.erase(sLine.length()-1, 1);
             capacity = stol(sLine);
-        return true;
-    }
-    else
-    {
-        return false;
         }
 }
 
 /**
  * \brief   parse ErrorCount
  * \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\": ");
     size_t found = sLine.find(search);
     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);
-        return true;
-    }
-    else
-    {
-        return false;
         }
 }
 
 /**
  * \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\": ");
     size_t found = sLine.find(search);
     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);
-        return true;
+
-    }
-    else
-    {
-        return false;
         }
 }
 
 /**
  * \brief   parse PowerCycle
  * \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\": ");
     size_t found = sLine.find(search);
@@ -245,41 +174,31 @@ bool SMART::parsePowerCycles(string sLine, uint32_t &powerCycles)
         {
             sLine.erase(0, sLine.find(": ") + 2);
             sLine.erase(sLine.length()-2, 2);
-        powerCycles = stol(sLine);
+            powerCycle = stol(sLine);
-        return true;
+
-    }
-    else
-    {
-        return false;
         }
 }
 
 /**
  * \brief   parse temperature
  * \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\": ");
     size_t found = sLine.find(search);
     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 == "{")
                 {
-            temperature = 0U; // this drive doesn't support temperature
+                    temperature = 0U; // this drive doesn't support temperatur
                 }
             else
                 {
                     temperature = stol(sLine);
                 }
-        return true;
-    }
-    else
-    {
-        return false;
         }
 }

src/tui.cpp

@@ -41,23 +41,12 @@ void TUI::initTUI()
     init_pair(COLOR_AREA_STDSCR,COLOR_WHITE, COLOR_BLUE);
     wbkgd(stdscr, COLOR_PAIR(COLOR_AREA_STDSCR));
 
-    init_pair(COLOR_AREA_ENTRY_EVEN, COLOR_BLACK, COLOR_WHITE);
+    init_pair(COLOR_AREA_ENTRY, COLOR_BLACK, COLOR_WHITE);
-    init_pair(COLOR_AREA_ENTRY_ODD, COLOR_BLUE, COLOR_WHITE);
+    init_pair(COLOR_AREA_ENTRY_SELECTED, COLOR_BLACK, COLOR_RED);
-
-#ifdef DRYRUN
-    init_pair(COLOR_AREA_ENTRY_SELECTED, COLOR_WHITE, COLOR_GREEN);
-#else
-    init_pair(COLOR_AREA_ENTRY_SELECTED, COLOR_WHITE, COLOR_RED);
-#endif
-
     init_pair(COLOR_AREA_OVERVIEW, 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 ");
-#endif
     Logger::logThis()->info("UI successfully initialized");
 }
 
@@ -72,12 +61,10 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
 
     refresh();
 
-    // overview window is 3/7 of the x-size
+    overview=createOverViewWindow((int)(u16StdscrX/3), (u16StdscrY-3));
-    overview = createOverViewWindow((int)(u16StdscrX * (float)(3.0 / 7.0)), (u16StdscrY - 1));
     wrefresh(overview);
 
-    // system stat window is 2/7 of the x-size
+    systemview=createSystemStats((int)(u16StdscrX/3), 10, u16StdscrX-(int)(u16StdscrX/3)-2, (u16StdscrY-11 ));
-    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);
@@ -93,9 +80,6 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
             string sSpeed = " ";
             string sTime = " ";
             string sTemp = it->sTemperatureToText();
-        string sConnection = (it->connectionType == Drive::USB ? "USB" : it->connectionType == Drive::SATA ? "SATA"
-                                                                     : it->connectionType == Drive::NVME   ? "NVME"
-                                                                                                           : "");
 
             bool bSelectedEntry = false;
 
@@ -121,13 +105,6 @@ void TUI::updateTUI(list<Drive> *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);
@@ -137,32 +114,24 @@ void TUI::updateTUI(list<Drive> *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->bWasDeleted)
+                    if (it->bWasDeleteted)
                         {
                             sState = "DELETED"; //mark drive as deleted previously
                         }
                     if (it->bWasShredded)
                         {
-                if (it->bWasChecked)
+                            sState = "SHREDDED"; //mark drive as shreded previously, overwrite if deleted
-                {
-                    // 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
+#ifdef ZERO_CHECK_ALERT
-            if (bSelectedEntry && it->bWasChecked && (it->u32DriveChecksumAfterShredding != 0U))
+                    if(bSelectedEntry && it->bWasShredded && (it->u32DriveChecksumAferShredding != 0U))
                         {
-                dialog = createZeroChecksumWarning(70, 16, ((u16StdscrX) - (int)(u16StdscrX / 2) - 20), (int)(u16StdscrY / 2) - 8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial(), it->u32DriveChecksumAfterShredding);
+                            dialog=createZeroChecksumWarning(70, 16, ((u16StdscrX)-(int)(u16StdscrX/2)-20),(int)(u16StdscrY/2)-8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial(), it->u32DriveChecksumAferShredding);
                             wrefresh(dialog);
                         }
 #endif
@@ -183,9 +152,7 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
                     break;
                 }
 
-        uint16_t u16StartOffsetY = (2 * (u8Index));
+            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);
-
-        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);
             wrefresh(tmp);
             u8Index++;
         }//end loop though drives
@@ -201,11 +168,11 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
             menustate.bDelete = false;
             menustate.bShred = false;
 
-        detailview = overwriteDetailViewWindow((u16StdscrX) - ((int)(u16StdscrX * (float)(3.0 / 7.0))) - 7, (u16StdscrY - 15), (int)(u16StdscrX * (float)(3.0 / 7.0) + 5));
+            menuview=createMenuView(((int)(u16StdscrX/3)-10 ), 10, (int)(u16StdscrX/3)+5,(u16StdscrY-11), menustate);
-        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);
+
+            detailview=overwriteDetailViewWindow(((u16StdscrX)-(int)(u16StdscrX/3)-7), (u16StdscrY-15), (int)(u16StdscrX/3)+5);
+            wrefresh(detailview);
         }
 
     mxUIrefresh.unlock();
@@ -240,9 +207,6 @@ enum TUI::UserInput TUI::readUserInput()
         case 'S':
             return TUI::UserInput::ShredAll;
             break;
-    case 'T':
-        return TUI::UserInput::Terminate;
-        break;
         default:
             return TUI::UserInput::Undefined;
             break;
@@ -263,13 +227,10 @@ 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, 1, 2);
+    newWindow = newwin(iYSize, iXSize, 2, 2);
 
     wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_OVERVIEW));
     box(newWindow, ACS_VLINE, ACS_HLINE);
@@ -282,7 +243,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, 1, iXStart);
+    newWindow = newwin(iYSize, iXSize, 2, iXStart);
     wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_DETAIL));
     box(newWindow, ACS_VLINE, ACS_HLINE);
 
@@ -290,7 +251,7 @@ WINDOW *TUI::createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive d
     centerTitle(newWindow, title.c_str());
 
     string sPath =  "Path:          " +drive.getPath();
-    string sModelFamily = "ModelFamily:   " + drive.getModelFamily();
+    string sModelFamlily = "ModelFamily:   " + drive.getModelFamily();
     string sModelName =  "ModelName:     " + drive.getModelName();
     string sCapacity =  "Capacity:      " + drive.sCapacityToText();
     string sSerial =  "Serial:        " + drive.getSerial();
@@ -301,7 +262,7 @@ WINDOW *TUI::createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive d
     uint16_t u16Line = 2;
 
     mvwaddstr(newWindow,u16Line++, 3, sPath.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sModelFamily.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sModelFamlily.c_str());
     mvwaddstr(newWindow,u16Line++, 3, sModelName.c_str());
     mvwaddstr(newWindow,u16Line++, 3, sCapacity.c_str());
     mvwaddstr(newWindow,u16Line++, 3, sSerial.c_str());
@@ -318,7 +279,7 @@ WINDOW *TUI::createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive d
 WINDOW* TUI::overwriteDetailViewWindow( int iXSize, int iYSize, int iXStart)
 {
     WINDOW *newWindow;
-    newWindow = newwin(iYSize, iXSize, 1, iXStart);
+    newWindow = newwin(iYSize, iXSize, 2, iXStart);
     wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_DETAIL));
     box(newWindow, ACS_VLINE, ACS_HLINE);
 
@@ -330,7 +291,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: Overwrite drive " + to_string(SHRED_ITERATIONS) + " iterations - this is secure";
+    string sLine06 =  "Shred: Overwite drive " + to_string(SHRED_ITERATIONS) + " iterations - this is secure";
 
     uint16_t u16Line = 5;
 
@@ -348,7 +309,7 @@ WINDOW *TUI::overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart)
     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;
     newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
@@ -356,67 +317,28 @@ WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart,
     if(!bSelected)
         {
             // entry is NOT selected
-        if (iListIndex % 2 == 0)
+            attron(COLOR_PAIR(COLOR_AREA_ENTRY));
-        {
+            wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY));
-            // 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_SELECTED));
+            attron(COLOR_PAIR(COLOR_AREA_ENTRY));
             wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY_SELECTED));
         }
 
-    // box(newWindow, ACS_VLINE, ACS_HLINE);
+    box(newWindow, ACS_VLINE, ACS_HLINE);
 
-    // index number
+    mvwaddstr(newWindow,1, 1, to_string(iListIndex).c_str());
-    mvwaddstr(newWindow, 0, 1, to_string(iListIndex).c_str());
 
-    /*
+    mvwaddstr(newWindow,1, 5, sModelFamily.c_str());
-    70 chars in x-axis
+    mvwaddstr(newWindow,2, 5, sSerial.c_str());
+    mvwaddstr(newWindow,3, 5, sCapacity.c_str());
+    mvwaddstr(newWindow,3, 5+sCapacity.length()+3, sTemp.c_str());
 
-    line:01
+    mvwaddstr(newWindow,1, iXSize-sSpeed.length()-5, sSpeed.c_str());
-        0:      space
+    mvwaddstr(newWindow,2, iXSize-sState.length()-5, sState.c_str());
-        1:      index number
+    mvwaddstr(newWindow,3, iXSize-sTime.length()-5, sTime.c_str());
-        2:      space
-        3-35:   ModelFamily
-        36:     space
-        37-43:  Capacity
-        44:     space
-        47-49:  Temp
-        57-60:  Connection Type
-
-    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());
-    mvwaddstr(newWindow, 0, 57, sConnection.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;
 }
@@ -451,7 +373,6 @@ 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());
@@ -472,7 +393,7 @@ WINDOW *TUI::createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, st
 
     centerTitle(newWindow, "Controls");
 
-    uint16_t u16Line = 4;
+    uint16_t u16Line = 2;
 
     if(menustate.bAbort)
         {
@@ -490,12 +411,8 @@ WINDOW *TUI::createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, st
         {
             string sLineTmp = "Press d for Delete";
             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;
 }
 
@@ -565,7 +482,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 sLineModelFamily = "ModelFamily:   " + sModelFamily;
+    string sLineModelFamlily = "ModelFamily:   " + sModelFamily;
     string sLineModelName =  "ModelName:     " + sModelName;
     string sLineSerial =  "Serial:        " + sSerial;
 
@@ -578,7 +495,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, sLineModelFamily.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLineModelFamlily.c_str());
     mvwaddstr(newWindow,u16Line++, 3, sLineModelName.c_str());
     mvwaddstr(newWindow,u16Line++, 3, sLineSerial.c_str());
     u16Line++;
@@ -613,19 +530,9 @@ 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;
-    static bool dialogIsActive;
     menustate.bAbort = false;
     menustate.bConfirmDelete = false;
     menustate.bConfirmShred =  false;
@@ -647,10 +554,6 @@ 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;
@@ -662,31 +565,25 @@ void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
             break;
         }
 
-    detailview = createDetailViewWindow((stdscrX) - ((int)(stdscrX * (float)(3.0 / 7.0))) - 7, (stdscrY - 15), (int)(stdscrX * (float)(3.0 / 7.0) + 5), drive);
+    detailview=createDetailViewWindow(((stdscrX)-(int)(stdscrX/3)-7), (stdscrY-15), (int)(stdscrX/3)+5, drive);
     wrefresh(detailview);
 
-    menuview = createMenuView(((int)(stdscrX * (float)(2.0 / 7.0))) - 3, 12, (int)(stdscrX * (float)(3.0 / 7.0) + 5), (stdscrY - 13), menustate);
+    menuview=createMenuView(((int)(stdscrX/3)-10 ), 10, (int)(stdscrX/3)+5,(stdscrY-11), menustate);
     wrefresh(menuview);
 
     if(menustate.bConfirmShred == true)
         {
             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);
-        dialogIsActive = 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");
             wrefresh(dialog);
-        dialogIsActive = true;
         }
     else
-    {
-        if (dialogIsActive)
         {
             delwin(dialog);
-            dialogIsActive = false;
-        }
         }
 }
 
@@ -723,7 +620,7 @@ WINDOW *TUI::createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart
 
     if(u32ErrorCount > 0)
         {
-        string sLineTmp = "S.M.A.R.T. errors detected: " + to_string(u32ErrorCount);
+            string sLineTmp = "S.M.A.R.T. erros detected: " + to_string(u32ErrorCount);
             mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLineTmp.c_str());
             u16Line++;
         }