random

.gitignore

@@ -41,10 +41,7 @@
 
 reHDD
 
-*.log
+reHDD.log
-*.ods
-*.txt
 
-.vscode/
 
 ignoreDrives.conf

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "tfnoisegen"]
-	path = tfnoisegen
-	url = https://git.mosad.xyz/localhorst/tfnoisegen.git

README.md

@@ -1,33 +1,18 @@
 # 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
 
 * `apt-get install ncurses-dev git make g++`
-* `git submodule init`
-* `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.
@@ -37,17 +22,13 @@ Instructions how to create a standalone machine that boots directly to reHDD. Th
 * Upload reHDD log every 12h if wanted
 
 ### Software requirements
-* `apt-get install hwinfo smartmontools curl htop sudo`
+* `apt-get install hwinfo smartmontools curl`
+
 
 ### Installation
 
 clone this repo into /root/
 
-```
-git submodule init
-git submodule update
-```
-
 `cd /root/reHDD/`
 
 `make release`

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

ignoreDrives.conf

@@ -1,3 +1,2 @@
 4673974d
 2cb3dea4
-8ffbc421

include/delete.h

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

include/drive.h

@@ -14,55 +14,45 @@ class Drive
 {
 
 public:
-    enum TaskState
+    enum TaskState {NONE,
-    {
+                    SHRED_SELECTED,
-        NONE,
+                    SHRED_ACTIVE,
-        SHRED_SELECTED,
+                    DELETE_SELECTED,
-        SHRED_ACTIVE, // shred iterations active
+                    DELETE_ACTIVE,
-        CHECK_ACTIVE, // optional checking active
+                    FROZEN
-        DELETE_SELECTED,
+                   } state;
-        DELETE_ACTIVE,
-        FROZEN
-    } state;
 
     struct
     {
         time_t u32ShredTimeDelta;
         std::chrono::time_point<std::chrono::system_clock> chronoShredTimestamp;
         unsigned long ulWrittenBytes;
-        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;
-    time_t u32Timestamp = 0U;          // unix timestamp for detecting a frozen drive
+    string sModelFamily;
-    double d32TaskPercentage = 0U;     // in percent for Shred (1 to 100)
+    string sModelName;
-    time_t u32TimestampTaskStart = 0U; // unix timestamp for duration of an action
+    string sSerial;
-    time_t u32TaskDuration = 0U;       // time needed to complete the task
+    uint64_t u64Capacity = 0U; //in byte
-
+    uint32_t u32ErrorCount = 0U;
-    struct
+    uint32_t u32PowerOnHours = 0U; //in hours
-    {
+    uint32_t u32PowerCycles = 0U;
-        string sModelFamily;
+    time_t u32Timestamp = 0U; //unix timestamp for detecting a frozen drive
-        string sModelName;
+    double d32TaskPercentage = 0U; //in percent for Shred (1 to 100)
-        string sSerial;
+    time_t u32TimestampTaskStart = 0U; //unix timestamp for duration of an action
-        uint64_t u64Capacity = 0U; // in byte
+    time_t u32TaskDuration = 0U; //time needed to complete the task
-        uint32_t u32ErrorCount = 0U;
-        uint32_t u32PowerOnHours = 0U; // in hours
-        uint32_t u32PowerCycles = 0U;
-        uint32_t u32Temperature = 0U; // in Fahrenheit, just kidding: degree Celsius
-    } sSmartData;
 
 private:
     void setTimestamp();
 
 protected:
+
 public:
     Drive(string path)
     {
@@ -73,27 +63,24 @@ public:
     string getModelFamily(void);
     string getModelName(void);
     string getSerial(void);
-    uint64_t getCapacity(void); // in byte
+    uint64_t getCapacity(void); //in byte
     uint32_t getErrorCount(void);
-    uint32_t getPowerOnHours(void); // in hours
+    uint32_t getPowerOnHours(void); //in hours
     uint32_t getPowerCycles(void);
-    uint32_t getTemperature(void); // in Fahrenheit, just kidding: degree Celsius
     void checkFrozenDrive(void);
 
-    void setDriveSMARTData(string modelFamily,
+    void setDriveSMARTData( string modelFamily,
-                           string modelName,
+                            string modelName,
-                           string serial,
+                            string serial,
-                           uint64_t capacity,
+                            uint64_t capacity,
-                           uint32_t errorCount,
+                            uint32_t errorCount,
-                           uint32_t powerOnHours,
+                            uint32_t powerOnHours,
-                           uint32_t powerCycles,
+                            uint32_t powerCycles);
-                           uint32_t temperature);
 
     string sCapacityToText();
     string sErrorCountToText();
     string sPowerOnHoursToText();
     string sPowerCyclesToText();
-    string sTemperatureToText();
 
     void setTaskPercentage(double d32TaskPercentage);
     double getTaskPercentage(void);
@@ -103,6 +90,7 @@ public:
 
     void calculateTaskDuration();
     time_t getTaskDuration();
+
 };
 
-#endif // DRIVE_H_
+#endif  // DRIVE_H_

include/logger/logger.h

@@ -28,26 +28,26 @@
 
 using namespace std;
 
-#define MENU_LINE_SIZE 110 // Size of menu lines
+#define MENU_LINE_SIZE 110 //Size of menu lines
 
 #ifndef LOG_PATH
-// #define LOG_PATH "./test.txt"
+//#define LOG_PATH "./test.txt"
 #endif
 
 #ifndef DESCRIPTION
-#define DESCRIPTION "Software-Name - Copyright Company 2020" // use your values here
+#define DESCRIPTION "Software-Name - Copyright Company 2020"        //use your values here
 #endif
 
 #ifndef DEVICE_ID
-#define DEVICE_ID "Device-Name" // use your values here
+#define DEVICE_ID  "Device-Name"                                    //use your values here
 #endif
 
 #ifndef SOFTWARE_VERSION
-#define SOFTWARE_VERSION "0.1.1.8" // use your values here
+#define SOFTWARE_VERSION  "0.1.1.8"                                 //use your values here
 #endif
 
 #ifndef HARDWARE_VERSION
-#define HARDWARE_VERSION "7.77.9" // use your values here
+#define HARDWARE_VERSION  "7.77.9"                                  //use your values here
 #endif
 
 class Logger
@@ -68,12 +68,13 @@ private:
     ~Logger();
 
 public:
+
     void info(string s);
     void warning(string s);
     void error(string s);
     void newLine();
 
-    static Logger *logThis();
+    static Logger* logThis();
 };
 
-#endif // LOGGER_H_
+#endif  // LOGGER_H_

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,34 +8,32 @@
 #ifndef REHDD_H_
 #define REHDD_H_
 
-#define REHDD_VERSION "V1.1.3"
+#define REHDD_VERSION "bV0.2.2"
 
 // Drive handling Settings
-#define WORSE_HOURS 19200    // mark drive if at this limit or beyond
+#define WORSE_HOURS   19200 //mark drive if at this limit or beyond
-#define WORSE_POWERUP 10000  // mark drive if at this limit or beyond
+#define WORSE_POWERUP 10000  //mark drive if at this limit or beyond
-#define WORSE_TEMPERATURE 55 // mark drive if at this limit or beyond
+#define SHRED_ITERATIONS 1U
-#define SHRED_ITERATIONS 3U
+#define FROZEN_TIMEOUT 10 //After this timeout (minutes) the drive will be marked as frozen
-#define FROZEN_TIMEOUT 20                           // After this timeout (minutes) the drive will be marked as frozen, if no progress
-#define METRIC_THRESHOLD 3L * 1000L * 1000L * 1000L // calc shred speed with this minimum of time delta
 
 // Logger Settings
 #define LOG_PATH "./reHDD.log"
-#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2024"
+#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2022"
-#define DEVICE_ID "generic"
+#define DEVICE_ID  "generic"
-#define SOFTWARE_VERSION REHDD_VERSION
+#define SOFTWARE_VERSION  "alpha"
-#define HARDWARE_VERSION "generic"
+#define HARDWARE_VERSION  "generic"
 
-// #define LOG_LEVEL_HIGH  //log everything, like drive scan thread
+//#define LOG_LEVEL_HIGH  //log everything, like drive scan thread
 #ifndef LOG_LEVEL_HIGH
-#define LOG_LEVEL_LOW // log only user actions and tasks
+#define LOG_LEVEL_LOW   //log only user actions and tasks 
 #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 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
+//IPC pipes
 #define READ 0
 #define WRITE 1
 
@@ -64,13 +62,11 @@ using namespace std;
 #include "shred.h"
 #include "delete.h"
 #include "tui.h"
-#include "printer.h"
 #include "logger/logger.h"
 
-extern Logger *logging;
+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,30 +74,28 @@ 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 searchDrives(list <Drive>* plistDrives);
-    static void startShredAllDrives(list<Drive> *plistDrives);
+    static void printDrives(list <Drive>* plistDrives);
-    static void updateShredMetrics(list<Drive> *plistDrives);
+    static  void filterIgnoredDrives(list <Drive>* plistDrives);
-    static void filterIgnoredDrives(list<Drive> *plistDrives);
+    static void filterNewDrives(list <Drive>* plistOldDrives, list <Drive>* plistNewDrives);
-    static void filterInvalidDrives(list<Drive> *plistDrives);
+    static void addSMARTData(list <Drive>* plistDrives);
-    static void filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDrives);
+    static void ThreadScannDevices();
-    static void addSMARTData(list<Drive> *plistDrives);
-    static void ThreadScanDevices();
     static void ThreadUserInput();
-    static void ThreadShred(Drive *const pDrive);
+    static void ThreadShred();
     static void ThreadDelete();
     static void ThreadCheckFrozenDrives();
     static void handleArrowKey(TUI::UserInput userInput);
     static void handleEnter();
     static void handleESC();
     static void handleAbort();
-    static Drive *getSelectedDrive();
+    static Drive* getSelectedDrive();
-    static bool getSystemDrive(string &systemDrive);
 };
 
-#endif // REHDD_H_
+#endif  // REHDD_H_

include/shred.h

@@ -17,39 +17,40 @@
 #include <unistd.h>
 #include <string.h>
 
-#define CHUNK_SIZE 1024 * 1024 * 32 // amount of bytes that are overwritten at once --> 32MB
+#define CHUNK_SIZE 1024*1024*2 //amount of bytes that are overwritten at once --> 2MB
-#define TFNG_DATA_SIZE CHUNK_SIZE   // amount of bytes used by tfng
+#define CHUNK_DIMENSION 100U //amount of chunks are read at once from random source
 
-// #define DEMO_DRIVE_SIZE 1024*1024*256L // 256MB
+//#define DEMO_DRIVE_SIZE 1024*1024*256L // 256MB
-// #define DEMO_DRIVE_SIZE 1024*1024*1024L // 1GB
+//#define DEMO_DRIVE_SIZE 1024*1024*1024L // 1GB
-// #define DEMO_DRIVE_SIZE 5*1024*1024*1024L // 5GB
+//#define DEMO_DRIVE_SIZE 1024*1024*1024*10L // 10GB
-// #define DEMO_DRIVE_SIZE 1024*1024*1024*10L // 10GB
 
 typedef int fileDescriptor;
 
 class Shred
 {
 protected:
+
 public:
+
     Shred();
     ~Shred();
-    int shredDrive(Drive *drive, int *ipSignalFd);
+    int shredDrive(Drive* drive, int* ipSignalFd);
 
 private:
     fileDescriptor randomSrcFileDiscr;
     fileDescriptor driveFileDiscr;
-    unsigned char caTfngData[TFNG_DATA_SIZE];
+    unsigned char caChunk[CHUNK_DIMENSION][CHUNK_SIZE];
-    unsigned char caReadBuffer[CHUNK_SIZE];
     unsigned long ulDriveByteSize;
-    unsigned long ulDriveByteOverallCount = 0; // all bytes shredded in all iterations + checking -> used for progress calculation
+    unsigned long ulDriveByteOverallCount = 0; //all bytes shredded in all iterations + checking -> used for progress calculation
     double d32Percent = 0.0;
     double d32TmpPercent = 0.0;
 
     inline double calcProgress();
     int iRewindDrive(fileDescriptor file);
     unsigned long getDriveSizeInBytes(fileDescriptor file);
-    unsigned int uiCalcChecksum(fileDescriptor file, Drive *drive, int *ipSignalFd);
+    unsigned int uiCalcChecksum(fileDescriptor file, Drive* drive, int* ipSignalFd);
     void cleanup();
+
 };
 
-#endif // SHRED_H_
+#endif  // SHRED_H_

include/smart.h

@@ -13,21 +13,28 @@
 class SMART
 {
 protected:
+
 public:
-    static void readSMARTData(Drive *drive);
+    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 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;
 };
 
-#endif // SMART_H_
+#endif  // SMART_H_

include/tui.h

@@ -12,27 +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, Delete, Enter, ESC, Undefined};
-        UpKey,
-        DownKey,
-        Abort,
-        Shred,
-        ShredAll,
-        Delete,
-        Enter,
-        ESC,
-        Undefined
-    };
     struct MenuState
     {
         bool bAbort;
@@ -46,7 +36,7 @@ public:
 
     static void initTUI();
 
-    void updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry);
+    void updateTUI(list <Drive>* plistDrives,  uint8_t u8SelectedEntry);
 
     static enum UserInput readUserInput();
 
@@ -55,28 +45,28 @@ private:
     static string sRamUsage;
     static string sLocalTime;
 
-    WINDOW *overview;
+    WINDOW* overview;
-    WINDOW *systemview;
+    WINDOW* systemview;
-    WINDOW *detailview;
+    WINDOW* detailview;
-    WINDOW *menuview;
+    WINDOW* menuview;
-    WINDOW *dialog;
+    WINDOW* dialog;
-    WINDOW *smartWarning;
+    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 *createOverViewWindow( int iXSize, int iYSize);
-    static WINDOW *createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive drive);
+    static WINDOW *createDetailViewWindow( int iXSize, int iYSize, int iXStart, Drive drive);
-    static WINDOW *overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart);
+    static WINDOW *overwriteDetailViewWindow( int iXSize, int iYSize, int iXStart);
-    static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, bool bSelected);
+    static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, string sModelFamily, string sModelName, string sCapacity, string sState, string sTime, string sSpeed, 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);
-    static WINDOW *createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, string sProgress);
+    static WINDOW* createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, string sProgress);
-    static WINDOW *createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles, uint32_t u32ErrorCount, uint32_t u32Temperature);
+    static WINDOW* createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles,  uint32_t u32ErrorCount);
-    static WINDOW *createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, uint32_t u32Checksum);
+    static WINDOW* createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, uint32_t u32Checksum);
 
     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_
+#endif  // TUI_H_

makefile

@@ -1,6 +1,6 @@
 #### PROJECT SETTINGS ####
 # The name of the executable to be created
-BIN_NAME := reHDD
+BIN_NAME := shredTest
 # Compiler used
 CXX ?= g++
 # Extension of source files used in the project
@@ -8,22 +8,19 @@ SRC_EXT = cpp
 # Path to the source directory, relative to the makefile
 SRC_PATH = src
 # Space-separated pkg-config libraries used by this project
-LIBS = lib
+LIBS =
 # 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
 INCLUDES = include
 # General linker settings
-LINK_FLAGS = -Llib -lpthread -lncurses -ltfng
+LINK_FLAGS = -lpthread -lncurses
-
 # Doc
 DOCDIR = doc
-TFRANDDIR = tfnoisegen
-TFRANDLIB = libtfng.a
 #### END PROJECT SETTINGS ####
 
 # Optionally you may move the section above to a separate config.mk file, and
@@ -54,7 +51,7 @@ ifeq ($(V),true)
 endif
 
 # Combine compiler and linker flags
-release: export CXXFLAGS := $(CXXFLAGS) $(COMPILE_FLAGS) $(RCOMPILE_FLAGS)
+release: export CXXFLAGS := $(CXXFLAGS) $(COMPILE_FLAGS) $(RCOMPILE_FLAGS) 
 release: export LDFLAGS := $(LDFLAGS) $(LINK_FLAGS) $(RLINK_FLAGS)
 debug: export CXXFLAGS := $(CXXFLAGS) $(COMPILE_FLAGS) $(DCOMPILE_FLAGS)
 debug: export LDFLAGS := $(LDFLAGS) $(LINK_FLAGS) $(DLINK_FLAGS)
@@ -161,7 +158,6 @@ dirs:
 	@echo "Creating directories"
 	@mkdir -p $(dir $(OBJECTS))
 	@mkdir -p $(BIN_PATH)
-	@mkdir -p $(LIBS)
 
 # Removes all build files
 .PHONY: clean
@@ -171,22 +167,16 @@ clean:
 	@echo "Deleting directories"
 	@$(RM) -r build
 	@$(RM) -r bin
-	@$(RM) -r $(LIBS)
 	@$(RM) -f reHDD.log
-	$(MAKE) clean -C tfnoisegen 
 
 # Main rule, checks the executable and symlinks to the output
 all: $(BIN_PATH)/$(BIN_NAME)
-	$(MAKE) libtfng.a -C tfnoisegen
-	@cp $(TFRANDDIR)/$(TFRANDLIB) $(LIBS)
 	@echo "Making symlink: $(BIN_NAME) -> $<"
 	@$(RM) $(BIN_NAME)
 	@ln -s $(BIN_PATH)/$(BIN_NAME) $(BIN_NAME)
 
 # Link the executable
 $(BIN_PATH)/$(BIN_NAME): $(OBJECTS)
-	$(MAKE) libtfng.a -C tfnoisegen
-	@cp $(TFRANDDIR)/$(TFRANDLIB) $(LIBS)
 	@echo "Linking: $@"
 	@$(START_TIME)
 	$(CMD_PREFIX)$(CXX) $(OBJECTS) $(LDFLAGS) -o $@

reHDDShred

@@ -0,0 +1 @@
+bin/release/reHDDShred

scripts/getty@tty2.service.d_override.conf

@@ -4,7 +4,7 @@ Description=dmesg on tty2
 [Service]
 WorkingDirectory=/usr/bin/
 ExecStart=
-ExecStart=-/usr/bin/dmesg -wHT
+ExecStart=-/usr/bin/dmesg -wH
 StandardInput=tty
 StandardOutput=tty
 Restart=always

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

shredTest

@@ -0,0 +1 @@
+bin/release/shredTest

src/delete.cpp

@@ -12,11 +12,11 @@
  * \param	pointer of Drive instance
  * \return  void
  */
-void Delete::deleteDrive(Drive *drive)
+void Delete::deleteDrive(Drive* drive)
 
 {
-    size_t len = 0;     // lenght of found line
+    size_t len = 0; //lenght of found line
-    char *cLine = NULL; // found line
+    char* cLine = NULL; //found line
 
 #ifndef DRYRUN
     string sCMD = ("wipefs -af ");
@@ -25,22 +25,18 @@ void Delete::deleteDrive(Drive *drive)
 #endif
 
 #ifdef DRYRUN
-    // cout << "dryrun for " << drive->getPath() << endl;
+    //cout << "dryrun for " << drive->getPath() << endl;
     string sCMD = ("echo");
 #endif
 
-    const char *cpComand = sCMD.c_str();
+    const char* cpComand = sCMD.c_str();
-    // cout << "delete: " << cpComand << endl;
+    //cout << "delete: " << cpComand << endl;
 
-    if (drive->bWasShredStarted == false)
+    FILE* deleteCmdOutput = popen(cpComand, "r");
-    {
-        //only start delete if the drive was not shredded before
-        FILE *deleteCmdOutput = popen(cpComand, "r");
 
-        while ((getline(&cLine, &len, deleteCmdOutput)) != -1)
+    while ((getline(&cLine, &len, deleteCmdOutput)) != -1)
         {
-            // wipefs running
+            //wipefs running
         }
-        pclose(deleteCmdOutput);
+    pclose(deleteCmdOutput);
-    }
 }

src/drive.cpp

@@ -14,56 +14,51 @@ string Drive::getPath(void)
 
 string Drive::getModelFamily(void)
 {
-    return sSmartData.sModelFamily;
+    return sModelFamily;
 }
 
 string Drive::getModelName(void)
 {
-    return sSmartData.sModelName;
+    return sModelName;
 }
 
 string Drive::getSerial(void)
 {
-    return sSmartData.sSerial;
+    return sSerial;
 }
 
 uint64_t Drive::getCapacity(void)
 {
-    return sSmartData.u64Capacity;
+    return u64Capacity;
 }
 
 uint32_t Drive::getErrorCount(void)
 {
-    return sSmartData.u32ErrorCount;
+    return u32ErrorCount;
 }
 uint32_t Drive::getPowerOnHours(void)
 {
-    return sSmartData.u32PowerOnHours;
+    return u32PowerOnHours;
 }
 
 uint32_t Drive::getPowerCycles(void)
 {
-    return sSmartData.u32PowerCycles;
+    return u32PowerCycles;
-}
-
-uint32_t Drive::getTemperature(void)
-{
-    return sSmartData.u32Temperature;
 }
 
 string Drive::sCapacityToText()
 {
     char acBuffer[16];
-    double dSize = (double)getCapacity();
+    double dSize = (double) getCapacity();
     uint16_t u16UnitIndex = 0;
-    const char *units[] = {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
+    const char* units[] = {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
-    while (dSize >= 1000) // using the marketing capacity
+    while (dSize >= 1000)   //using the marketing capacity
-    {
+        {
-        dSize /= 1000;
+            dSize /= 1000;
-        u16UnitIndex++;
+            u16UnitIndex++;
-    }
+        }
 
-    sprintf(acBuffer, "%.*f %s", u16UnitIndex - 3, dSize, units[u16UnitIndex]);
+    sprintf(acBuffer, "%.*f %s", u16UnitIndex-3, dSize, units[u16UnitIndex]);
     return acBuffer;
 }
 
@@ -72,6 +67,7 @@ string Drive::sErrorCountToText()
     return to_string(getErrorCount());
 }
 
+
 string Drive::sPowerOnHoursToText()
 {
     double dDays = 0U;
@@ -80,8 +76,8 @@ string Drive::sPowerOnHoursToText()
     stringstream streamDays;
     stringstream streamYears;
 
-    dDays = (double)((double)u32Hours / (double)24U);
+    dDays = (double) ((double)u32Hours/(double)24U);
-    dYears = (double)((double)u32Hours / (double)8760U);
+    dYears = (double) ((double)u32Hours/(double)8760U);
 
     streamDays << fixed << setprecision(0) << dDays;
     streamYears << fixed << setprecision(1) << dYears;
@@ -96,25 +92,20 @@ string Drive::sPowerCyclesToText()
     return to_string(getPowerCycles());
 }
 
-string Drive::sTemperatureToText()
-{
-    return to_string(getTemperature()) + " C";
-    ;
-}
-
 void Drive::setTaskPercentage(double d32TaskPercentage)
 {
-    if (d32TaskPercentage <= 100)
+    if(d32TaskPercentage <= 100)
-    {
+        {
-        this->d32TaskPercentage = d32TaskPercentage;
+            this->d32TaskPercentage = d32TaskPercentage;
-        this->setTimestamp(); // set timestamp for this progress for detecting a frozen drive
+            this->setTimestamp(); //set timestamp for this progress for detecting a frozen drive
-    }
+        }
 }
 double Drive::getTaskPercentage(void)
 {
     return this->d32TaskPercentage;
 }
 
+
 /**
  * \brief   set S.M.A.R.T. values in model
  * \param	string modelFamily
@@ -124,26 +115,24 @@ double Drive::getTaskPercentage(void)
  * \param   uint32_t errorCount
  * \param   uint32_t powerOnHours
  * \param   uint32_t powerCycle
- * \param   uint32_t temperature
  * \return  void
  */
-void Drive::setDriveSMARTData(string modelFamily,
+void Drive::setDriveSMARTData( string modelFamily,
-                              string modelName,
+                               string modelName,
-                              string serial,
+                               string serial,
-                              uint64_t capacity,
+                               uint64_t capacity,
-                              uint32_t errorCount,
+                               uint32_t errorCount,
-                              uint32_t powerOnHours,
+                               uint32_t powerOnHours,
-                              uint32_t powerCycle,
+                               uint32_t powerCycle)
-                              uint32_t temperature)
 {
-    this->sSmartData.sModelFamily = modelFamily;
+    this->sModelFamily = modelFamily;
-    this->sSmartData.sModelName = modelName;
+    sModelName = modelName;
-    this->sSmartData.sSerial = serial;
+    sSerial = serial;
-    this->sSmartData.u64Capacity = capacity;
+    u64Capacity = capacity;
-    this->sSmartData.u32ErrorCount = errorCount;
+    u32ErrorCount = errorCount;
-    this->sSmartData.u32PowerOnHours = powerOnHours;
+    u32PowerOnHours = powerOnHours;
-    this->sSmartData.u32PowerCycles = powerCycle;
+    u32PowerCycles = powerCycle;
-    this->sSmartData.u32Temperature = temperature;
+
 }
 
 void Drive::setTimestamp()
@@ -179,11 +168,11 @@ void Drive::checkFrozenDrive(void)
     time_t u32localtime;
     time(&u32localtime);
 
-    if ((u32localtime - this->u32Timestamp) >= (FROZEN_TIMEOUT * 60) && (this->u32Timestamp > 0) && (this->getTaskPercentage() < 100.0))
+    if((u32localtime - this->u32Timestamp) >= (FROZEN_TIMEOUT*60) && (this->u32Timestamp > 0))
-    {
+        {
-        Logger::logThis()->warning("Drive Frozen: " + this->getModelName() + " " + this->getSerial());
+            Logger::logThis()->warning("Drive Frozen: " + this->getModelName() + " " + this->getSerial());
-        this->bWasDeleted = false;
+            this->bWasDeleteted = false;
-        this->bWasShredded = false;
+            this->bWasShredded = false;
-        this->state = Drive::FROZEN;
+            this->state = Drive::FROZEN;
-    }
+        }
 }

src/logger/logger.cpp

@@ -5,18 +5,21 @@
  * @date    04.09.2020
  */
 
+
 #include "../../include/reHDD.h" //for logger settings
 #include "../../include/logger/logger.h"
 
 using namespace std;
 
-string version = "0.2.1"; // logger version
+string version =  "0.2.1"; //logger version
 
 bool Logger::instanceFlag = false;
-Logger *Logger::single = NULL;
+Logger* Logger::single = NULL;
 
 /**
  * \brief   create new logger instance
+ * \param	path to log file
+ * \param	struct with data
  * \return  instance of Logger
  */
 Logger::Logger()
@@ -94,13 +97,13 @@ void Logger::error(string s)
 void Logger::writeLog(string s)
 {
     ofstream logFile;
-    Logger::mtxLog.lock(); // lock this section for other threads
+    Logger::mtxLog.lock(); //lock this section for other threads
     logFile.open(this->logPath, ios_base::app);
 
-    logFile << (s + "\n"); // append to existing file
+    logFile << (s + "\n"); //append to existing file
 
     logFile.close();
-    Logger::mtxLog.unlock(); // unlock this section for other threads
+    Logger::mtxLog.unlock(); //unlock this section for other threads
 }
 
 /**
@@ -119,21 +122,21 @@ void Logger::newLine()
  */
 string Logger::getTimestamp()
 {
-    struct tm *timeinfo;
+    struct tm * timeinfo;
     struct timeval tv;
     int millisec;
-    char cpDate[80];
+    char cpDate [80];
-    char buffer[120];
+    char buffer [120];
 
     gettimeofday(&tv, NULL);
-    millisec = lrint(tv.tv_usec / 1000.0); // Round to nearest millisec
+    millisec = lrint(tv.tv_usec/1000.0); // Round to nearest millisec
-    if (millisec >= 1000)                  // Allow for rounding up to nearest second
+    if (millisec>=1000)   // Allow for rounding up to nearest second
-    {
+        {
-        millisec -= 1000;
+            millisec -=1000;
-        tv.tv_sec++;
+            tv.tv_sec++;
-    }
+        }
     timeinfo = localtime(&tv.tv_sec);
-    strftime(cpDate, 80, "%d/%m/%Y %T", timeinfo);
+    strftime (cpDate,80,"%d/%m/%Y %T",timeinfo);
     sprintf(buffer, "%s.%03d", cpDate, millisec);
     return buffer;
 }
@@ -146,17 +149,18 @@ string Logger::getTimestamp()
 string Logger::getMacAddress()
 {
     struct ifreq ifr;
-    int s = socket(AF_INET, SOCK_STREAM, 0);
+    int s = socket(AF_INET, SOCK_STREAM,0);
 
     strcpy(ifr.ifr_name, "eth0");
     if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
-    {
+        {
-        strcpy(ifr.ifr_name, "eno1");
+            strcpy(ifr.ifr_name, "eno1");
-    }
+
+        }
 
     unsigned char *hwaddr = (unsigned char *)ifr.ifr_hwaddr.sa_data;
-    char buffer[80];
+    char buffer [80];
-    sprintf(buffer, "%02X:%02X:%02X:%02X:%02X:%02X", hwaddr[0], hwaddr[1], hwaddr[2],
+    sprintf(buffer,"%02X:%02X:%02X:%02X:%02X:%02X", hwaddr[0], hwaddr[1], hwaddr[2],
             hwaddr[3], hwaddr[4], hwaddr[5]);
     close(s);
     string tmp = buffer;
@@ -172,22 +176,22 @@ string Logger::getMacAddress()
  */
 string Logger::padStringMenu(char cBorder, string text, uint8_t u8LineLenght)
 {
-    string result(1, cBorder);
+    string result(1,cBorder);
     uint8_t u8TextSize = text.length();
-    uint8_t u8Padding = ((u8LineLenght - u8TextSize) / 2);
+    uint8_t u8Padding = ((u8LineLenght-u8TextSize)/2);
 
-    for (uint8_t i = 0; i < u8Padding; i++)
+    for(uint8_t i = 0 ; i < u8Padding; i++)
-    {
+        {
-        result.append(" ");
+            result.append(" ");
-    }
+        }
 
     result.append(text);
 
-    while ((uint8_t)result.length() < (u8LineLenght - 1))
+    while((uint8_t)result.length() < (u8LineLenght-1))
-    {
+        {
 
-        result.append(" ");
+            result.append(" ");
-    }
+        }
 
     result.append(string(1, cBorder));
     return result;
@@ -201,12 +205,12 @@ string Logger::padStringMenu(char cBorder, string text, uint8_t u8LineLenght)
  */
 string Logger::menuLine(char cBorder, uint8_t u8LineLenght)
 {
-    string result(1, cBorder);
+    string result(1,cBorder);
 
-    while ((uint8_t)result.length() < u8LineLenght)
+    while((uint8_t)result.length() < u8LineLenght)
-    {
+        {
-        result.append(string(1, cBorder));
+            result.append(string(1, cBorder));
-    }
+        }
     return result;
 }
 
@@ -214,16 +218,18 @@ string Logger::menuLine(char cBorder, uint8_t u8LineLenght)
  * \brief   return a instance of the logger
  * \return  logger obj
  */
-Logger *Logger::logThis()
+Logger* Logger::logThis()
 {
     if (!instanceFlag)
-    {
+        {
-        single = new Logger(); // create new obj
+            single = new Logger(); //create new obj
-        instanceFlag = true;
+            instanceFlag = true;
-        return single;
+            return single;
-    }
+        }
     else
-    {
+        {
-        return single; // return existing obj
+            return single; //return existing obj
-    }
+        }
 }
+
+

src/main.cpp

@@ -16,7 +16,7 @@ int main(void)
 {
     // cout << "refurbishingHddTool" << endl;
 
-    reHDD *app = new reHDD();
+    reHDD* app = new reHDD();
     app->app_logic();
     return EXIT_SUCCESS;
 }

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

@@ -7,19 +7,13 @@
 
 #include "../include/reHDD.h"
 
-static int fdNewDrivesInformPipe[2]; // File descriptor for pipe that informs if new drives are found
+static int fdNewDrivesInformPipe[2];//File descriptor for pipe that informs if new drives are found
 
-static int fdShredInformPipe[2]; // File descriptor for pipe that informs if a wipe thread signals
+static int fdShredInformPipe[2];//File descriptor for pipe that informs if a wipe thread signals
 
-static std::mutex mxDrives;
+static Drive* pDummyDrive;
 
-list<Drive> listNewDrives; // store found drives that are updated every 5sec
+static  uint8_t u8SelectedEntry;
-
-static list<Drive> listDrives; // stores all drive data from scan thread
-
-TUI *ui;
-
-static uint8_t u8SelectedEntry;
 
 static fd_set selectSet;
 
@@ -40,644 +34,58 @@ reHDD::reHDD(void)
  */
 void reHDD::app_logic(void)
 {
-    ui = new TUI();
+    pDummyDrive = new Drive("/dev/sdc");
-    ui->initTUI();
+    pDummyDrive->state = Drive::NONE;
+    pDummyDrive->bIsOffline = false;
 
     pipe(fdNewDrivesInformPipe);
     pipe(fdShredInformPipe);
 
-    thread thDevices(ThreadScanDevices);                 // start thread that scans for drives
+    getSelectedDrive()->state = Drive::TaskState::SHRED_ACTIVE;
-    thread thUserInput(ThreadUserInput);                 // start thread that reads user input
+    thread(ThreadShred).detach();
-    thread thCheckFrozenDrives(ThreadCheckFrozenDrives); // start thread that checks timeout for drives
 
-    while (1)
+    while(1)
-    {
-        FD_ZERO(&selectSet);
-        FD_SET(fdNewDrivesInformPipe[0], &selectSet);
-        FD_SET(fdShredInformPipe[0], &selectSet);
-
-        select(FD_SETSIZE, &selectSet, NULL, NULL, NULL);
-
-        if (FD_ISSET(fdNewDrivesInformPipe[0], &selectSet))
         {
-            mxDrives.lock();
+            FD_ZERO(&selectSet);
-            char dummy;
+            FD_SET(fdNewDrivesInformPipe[0], &selectSet);
-            read(fdNewDrivesInformPipe[0], &dummy, 1);
+            FD_SET(fdShredInformPipe[0], &selectSet);
-            filterNewDrives(&listDrives, &listNewDrives); // filter and copy to app logic vector
-            printDrives(&listDrives);
-            mxDrives.unlock();
-        }
-        if (FD_ISSET(fdShredInformPipe[0], &selectSet))
-        {
-            char dummy;
-            read(fdShredInformPipe[0], &dummy, 1);
-            updateShredMetrics(&listDrives);
-#ifdef LOG_LEVEL_HIGH
-            Logger::logThis()->info("got progress signal from a shred task");
-#endif
-        }
-        ui->updateTUI(&listDrives, u8SelectedEntry);
-    } // endless loop
-    thDevices.join();
-    thUserInput.join();
-    thCheckFrozenDrives.join();
-}
 
-Drive *reHDD::getSelectedDrive()
+            select(FD_SETSIZE, &selectSet, NULL, NULL, NULL);
-{
-    if (u8SelectedEntry < listDrives.size())
-    {
-        list<Drive>::iterator it = listDrives.begin();
-        advance(it, u8SelectedEntry);
-        return &(*it);
-    }
-    else
-    {
-        Logger::logThis()->warning("selected drive not present");
-        return {};
-    }
-}
 
-void reHDD::ThreadScanDevices()
+            if(FD_ISSET(fdShredInformPipe[0], &selectSet))
-{
-    while (true)
-    {
-        mxDrives.lock();
-        listNewDrives.clear();
-        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
-    }
-}
-
-void reHDD::ThreadCheckFrozenDrives()
-{
-    while (true)
-    {
-        mxDrives.lock();
-        for (auto it = begin(listDrives); it != end(listDrives); ++it)
-        {
-            if (it->state == Drive::SHRED_ACTIVE)
-            {
-                it->checkFrozenDrive();
-            }
-        }
-        mxDrives.unlock();
-        sleep(13); // sleep 13 sec
-    }
-}
-
-void reHDD::ThreadUserInput()
-{
-    while (true)
-    {
-        // cout << TUI::readUserInput() << endl;
-        switch (TUI::readUserInput())
-        {
-        case TUI::UserInput::DownKey:
-            // cout << "Down" << endl;
-            handleArrowKey(TUI::UserInput::DownKey);
-            ui->updateTUI(&listDrives, u8SelectedEntry);
-            break;
-        case TUI::UserInput::UpKey:
-            // cout << "Up" << endl;
-            handleArrowKey(TUI::UserInput::UpKey);
-            ui->updateTUI(&listDrives, u8SelectedEntry);
-            break;
-        case TUI::UserInput::Undefined:
-            // cout << "Undefined" << endl;
-            break;
-        case TUI::UserInput::Abort:
-            // cout << "Abort" << endl;
-            handleAbort();
-            ui->updateTUI(&listDrives, u8SelectedEntry);
-            break;
-        case TUI::UserInput::Delete:
-            // cout << "Delete" << endl;
-
-            if (getSelectedDrive() != nullptr)
-            {
-                if (getSelectedDrive()->state == Drive::NONE)
                 {
-                    getSelectedDrive()->state = Drive::DELETE_SELECTED;
+                    char dummy;
+                    read (fdShredInformPipe[0],&dummy,1);
+
+                    stringstream stream; 
+                    stream << fixed << setprecision(3) << (getSelectedDrive()->getTaskPercentage());
+                    string sState = "Shredding: " + stream.str() + "%";
+
+                    std::ostringstream out;
+                    double dDeltaSec = ((double)((getSelectedDrive()->sShredSpeed.u32ShredTimeDelta)/1000000000.0)); //convert nano in sec
+                    double speed = ((getSelectedDrive()->sShredSpeed.ulWrittenBytes/1000000.0)/dDeltaSec);
+                    char s[25];
+                    sprintf(s, "%0.2lf MB/s", speed);
+                    out << s;
+                    Logger::logThis()->info(sState + " - " + out.str());
                 }
-            }
+        } //endless loop
-
-            ui->updateTUI(&listDrives, u8SelectedEntry);
-            break;
-        case TUI::UserInput::Shred:
-            // cout << "Shred" << endl;
-
-            if (getSelectedDrive() != nullptr)
-            {
-                if (getSelectedDrive()->state == Drive::NONE)
-                {
-                    getSelectedDrive()->state = Drive::SHRED_SELECTED;
-                }
-            }
-
-            ui->updateTUI(&listDrives, u8SelectedEntry);
-            break;
-        case TUI::UserInput::ShredAll:
-            // cout << "ShredAll" << endl;
-            startShredAllDrives(&listDrives);
-            ui->updateTUI(&listDrives, u8SelectedEntry);
-            break;
-        case TUI::UserInput::Enter:
-            // cout << "Enter" << endl;
-            handleEnter();
-            ui->updateTUI(&listDrives, u8SelectedEntry);
-            break;
-        case TUI::UserInput::ESC:
-            // cout << "ESC" << endl;
-            handleESC();
-            ui->updateTUI(&listDrives, u8SelectedEntry);
-            break;
-        default:
-            break;
-        }
-    }
 }
 
-void reHDD::ThreadShred(Drive *const pDrive)
+Drive* reHDD::getSelectedDrive()
 {
-    if (pDrive != nullptr)
+    return pDummyDrive;
-    {
-        pDrive->setActionStartTimestamp();                     // save timestamp at start of shredding
-        Shred *pShredTask = new Shred();                       // create new shred task
-        pShredTask->shredDrive(pDrive, &fdShredInformPipe[1]); // start new shred task
-        delete pShredTask;                                     // delete shred task
-        ui->updateTUI(&listDrives, u8SelectedEntry);
-    }
 }
 
-void reHDD::ThreadDelete()
+void reHDD::ThreadShred()
 {
     if (getSelectedDrive() != nullptr)
-    {
+        {
-        getSelectedDrive()->setActionStartTimestamp();      // save timestamp at start of deleting
+            Logger::logThis()->info("Starting Shred Thread");
-        Delete::deleteDrive(getSelectedDrive());            // blocking, no thread
+            getSelectedDrive()->setActionStartTimestamp(); //save timestamp at start of shredding
-        getSelectedDrive()->state = Drive::TaskState::NONE; // delete finished
+            Shred* pShredTask = new Shred(); //create new shred task
-        getSelectedDrive()->bWasDeleted = true;
+            pShredTask->shredDrive(getSelectedDrive(), &fdShredInformPipe[1]); //start new shred task
-        Logger::logThis()->info("Finished delete for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
+            delete pShredTask; //delete shred task
-        ui->updateTUI(&listDrives, u8SelectedEntry);
+        }
-    }
 }
 
-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
-
-    // remove offline old drives from previously run
-    for (itOld = plistOldDrives->begin(); itOld != plistOldDrives->end();)
-    {
-        if (itOld->bIsOffline == true)
-        {
-            Logger::logThis()->warning("Offline drive found: " + itOld->getPath());
-            itOld = plistOldDrives->erase(itOld);
-            /*
-            if(plistOldDrives->size() > 0){ //This can be a risk if the user starts a task for the selected drive and the selected drive changes
-                u8SelectedEntry = 0U;
-            }
-            */
-        }
-        else
-        {
-            ++itOld;
-        }
-    }
-
-    // search offline drives and mark them
-    for (itOld = plistOldDrives->begin(); itOld != plistOldDrives->end(); ++itOld)
-    {
-        itOld->bIsOffline = true; // set offline before searching in the new list
-        for (itNew = plistNewDrives->begin(); itNew != plistNewDrives->end();)
-        {
-            if ((itOld->getSerial() == itNew->getSerial()) || (itOld->getPath() == itNew->getPath()))
-            {
-                itOld->bIsOffline = false; // drive is still attached
-                // 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());
-#endif
-                itNew = plistNewDrives->erase(itNew); // This drive is already attached, remove from new list
-            }
-            else
-            {
-                ++itNew;
-            }
-        }
-    }
-
-    // mark offline old drives
-    for (itOld = plistOldDrives->begin(); itOld != plistOldDrives->end(); ++itOld)
-    {
-        if (itOld->bIsOffline == true)
-        {
-            // cout << "offline drive found: " << itOld->getPath() << endl;
-            Logger::logThis()->warning("Mark offline drive found: " + itOld->getPath());
-            itOld->state = Drive::NONE; // clear state --> shred task will terminate
-        }
-    }
-
-    // add new drives to drive list
-    for (itNew = plistNewDrives->begin(); itNew != plistNewDrives->end(); ++itNew)
-    {
-        plistOldDrives->push_back(*itNew);
-        // Logger::logThis()->info("Add new drive: " + itNew->getModelName());
-    }
-    plistNewDrives->clear();
-}
-
-/**
- * \brief   search attached drives on /dev/sd*
- * \param	pointer of list <Drive>* plistDrives
- * \return  void
- */
-void reHDD::searchDrives(list<Drive> *plistDrives)
-{
-    // Logger::logThis()->info("-->    search drives   <--");
-    char *cLine = NULL;
-    size_t len = 0;
-
-    FILE *outputfileHwinfo = popen("lsblk -e 11 -d -o NAME", "r");
-
-    if (outputfileHwinfo == NULL)
-    {
-        Logger::logThis()->error("Unable to scan attached drives");
-        exit(EXIT_FAILURE);
-    }
-
-    while ((getline(&cLine, &len, outputfileHwinfo)) != -1)
-    {
-        if (string(cLine).length() == 4)
-        {
-            Drive *tmpDrive = new Drive("/dev/" + string(cLine).substr(0, 3));
-            tmpDrive->state = Drive::NONE;
-            tmpDrive->bIsOffline = false;
-            plistDrives->push_back(*tmpDrive);
-            // Logger::logThis()->info("SATA drive found: " + tmpDrive->getPath());
-        }
-
-        if (string(cLine).length() == 8)
-        {
-            Drive *tmpDrive = new Drive("/dev/" + string(cLine).substr(0, 7));
-            tmpDrive->state = Drive::NONE;
-            tmpDrive->bIsOffline = false;
-            plistDrives->push_back(*tmpDrive);
-            // Logger::logThis()->info("NVME drive found: " + tmpDrive->getPath());
-        }
-    }
-    pclose(outputfileHwinfo);
-}
-
-/**
- * \brief   filter out drives that are listed in "ignoreDrives.conf"
- * \param	pointer of list <Drive>* plistDrives
- * \return  void
- */
-void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
-{
-    string systemDrivePath;
-    if (getSystemDrive(systemDrivePath))
-    {
-        // Logger::logThis()->info("Found system drive: " + systemDrivePath);
-
-        list<Drive>::iterator it;
-        for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-        {
-            if (it->getPath().find(systemDrivePath) != std::string::npos) // compare found system drive and current drive
-            {
-                // system drive found --> ignore this drive
-#ifdef LOG_LEVEL_HIGH
-                Logger::logThis()->info("system drive found --> ignore this drive: " + it->getPath());
-#endif
-                it = plistDrives->erase(it);
-                it--;
-            }
-        }
-    }
-
-    list<tuple<string>> vtlIgnoredDevices; // store drives from ignore file
-    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
-    for (auto row : vtlIgnoredDevices)
-    {
-        list<Drive>::iterator it;
-        for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-        {
-            string sUUID;
-            char *cLine = NULL;
-            size_t len = 0;
-            string sCMD = "blkid ";
-            sCMD.append(it->getPath());
-            // cout << "cmd: " << sCMD << endl;
-            FILE *outputfileBlkid = popen(sCMD.c_str(), "r"); // get UUID from drive
-            if (outputfileBlkid == NULL)
-            {
-                exit(EXIT_FAILURE);
-            }
-
-            while ((getline(&cLine, &len, outputfileBlkid)) != -1) // parse UUID from blkid
-            {
-                if (string(cLine).find("PTUUID") != string::npos)
-                {
-                    string sBlkidOut = string(cLine);
-                    sBlkidOut.erase(0, 18);
-                    sBlkidOut.erase(8, sBlkidOut.length());
-                    sUUID = sBlkidOut;
-                    // cout << "blkid uuid:" << sUUID << endl;
-                }
-            }
-            pclose(outputfileBlkid);
-            // cout << "blkid uuid:" << sUUID << endl;
-
-            if (!get<0>(row).compare(sUUID)) // compare uuid from ignore file and uuid from drive
-            {
-                // same uuid found than in ignore file --> ignore this drive
-#ifdef LOG_LEVEL_HIGH
-                Logger::logThis()->info("same uuid found than in ignore file --> ignore this drive: " + it->getPath());
-#endif
-                it = plistDrives->erase(it);
-                it--;
-            }
-        }
-    }
-}
-
-/**
- * \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
- * \return  void
- */
-void reHDD::startShredAllDrives(list<Drive> *plistDrives)
-{
-    list<Drive>::iterator it;
-    mxDrives.lock();
-    for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-    {
-        if (it->state == Drive::NONE)
-        {
-            Drive *pTmpDrive = iterator_to_pointer<Drive, std::list<Drive>::iterator>(it);
-#ifdef LOG_LEVEL_HIGH
-            ostringstream address;
-            address << (void const *)&(*pTmpDrive);
-            Logger::logThis()->info("Started shred (all) for: " + pTmpDrive->getModelName() + "-" + pTmpDrive->getSerial() + " @" + address.str());
-#endif
-            pTmpDrive->state = Drive::TaskState::SHRED_ACTIVE;
-            thread(ThreadShred, pTmpDrive).detach();
-        }
-    }
-    mxDrives.unlock();
-}
-
-/**
- * \brief   print drives with all information
- * \param	pointer of list <Drive>* plistDrives
- * \return  void
- */
-void reHDD::printDrives(list<Drive> *plistDrives)
-{
-#ifdef LOG_LEVEL_HIGH
-    Logger::logThis()->info("------------DRIVES START------------");
-    // cout << "------------DRIVES---------------" << endl;
-    list<Drive>::iterator it;
-    uint8_t u8Index = 0;
-    for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-    {
-        /*
-           cout << "        Drive: " << distance(pvecDrives->begin(), it) << endl;
-           cout << "Path:          " << it->getPath() << endl;
-           cout << "ModelFamily:   " << it->getModelFamily() << endl;
-           cout << "ModelName:     " << it->getModelName() << endl;
-           cout << "Capacity:      " << it->getCapacity() << endl;
-           cout << "Serial:        " << it->getSerial() << endl;
-           cout << "PowerOnHours:  " << it->getPowerOnHours() << endl;
-           cout << "PowerCycle:    " << it->getPowerCycles() << endl;
-           cout << "ErrorCount:    " << it->getErrorCount() << endl;
-           cout << endl;*/
-
-        ostringstream address;
-        address << (void const *)&(*it);
-        Logger::logThis()->info(to_string(u8Index++) + ": " + it->getPath() + " - " + it->getModelFamily() + " - " + it->getSerial() + " @" + address.str());
-    }
-    Logger::logThis()->info("------------DRIVES END--------------");
-    // cout << "---------------------------------" << endl;
-#endif
-}
-
-/**
- * \brief   update shred metrics for all drives
- * \param	pointer of list <Drive>* plistDrives
- * \return  void
- */
-void reHDD::updateShredMetrics(list<Drive> *plistDrives)
-{
-    list<Drive>::iterator it;
-    for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-    {
-        if (it->state == Drive::SHRED_ACTIVE)
-        {
-            Drive *pTmpDrive = iterator_to_pointer<Drive, std::list<Drive>::iterator>(it);
-            // set metrics for calculating shred speed
-            std::chrono::time_point<std::chrono::system_clock> chronoCurrentTimestamp = std::chrono::system_clock::now();
-            time_t u32ShredTimeDelta = (chronoCurrentTimestamp - pTmpDrive->sShredSpeed.chronoShredTimestamp).count();
-            if (u32ShredTimeDelta > METRIC_THRESHOLD)
-            {
-                pTmpDrive->sShredSpeed.u32ShredTimeDelta = u32ShredTimeDelta;
-                pTmpDrive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();
-                pTmpDrive->sShredSpeed.ulWrittenBytes = pTmpDrive->sShredSpeed.ulSpeedMetricBytesWritten;
-                pTmpDrive->sShredSpeed.ulSpeedMetricBytesWritten = 0U;
-            }
-        }
-    }
-}
-
-/**
- * \brief   add S.M.A.R.T data from SMART
- * \param	pointer of list <Drive>* plistDrives
- * \return  void
- */
-void reHDD::addSMARTData(list<Drive> *plistDrives)
-{
-    list<Drive>::iterator it;
-    for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-    {
-        Drive *pTmpDrive = iterator_to_pointer<Drive, std::list<Drive>::iterator>(it);
-        SMART::readSMARTData(pTmpDrive);
-    }
-}
-
-void reHDD::handleArrowKey(TUI::UserInput userInput)
-{
-    int8_t u8EntrySize = (int8_t)listDrives.size();
-    switch (userInput)
-    {
-    case TUI::UserInput::DownKey:
-        u8SelectedEntry++;
-        if (u8SelectedEntry >= u8EntrySize)
-        {
-            u8SelectedEntry = 0;
-        }
-        break;
-    case TUI::UserInput::UpKey:
-        if (u8SelectedEntry == 0)
-        {
-            u8SelectedEntry = (u8EntrySize - 1);
-        }
-        else
-        {
-            u8SelectedEntry--;
-        }
-        break;
-    default:
-        u8SelectedEntry = 0;
-        break;
-    }
-
-    // Logger::logThis()->info("ArrowKey - selected drive: " + to_string(u8SelectedEntry));
-}
-
-void reHDD::handleEnter()
-{
-
-    if (getSelectedDrive() != nullptr)
-    {
-        if (getSelectedDrive()->state == Drive::TaskState::SHRED_SELECTED)
-        {
-            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();
-            thread(ThreadShred, pTmpDrive).detach();
-        }
-
-        if (getSelectedDrive()->state == Drive::TaskState::DELETE_SELECTED)
-        {
-            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
-            thread(ThreadDelete).detach();
-        }
-    }
-}
-
-void reHDD::handleESC()
-{
-    if (getSelectedDrive() != nullptr)
-    {
-        if (getSelectedDrive()->state == Drive::TaskState::SHRED_SELECTED)
-        {
-            getSelectedDrive()->state = Drive::TaskState::NONE;
-            // task for drive is selected --> remove selection
-        }
-
-        if (getSelectedDrive()->state == Drive::TaskState::DELETE_SELECTED)
-        {
-            getSelectedDrive()->state = Drive::TaskState::NONE;
-            // task for drive is selected --> remove selection
-        }
-    }
-}
-
-void reHDD::handleAbort()
-{
-    if (getSelectedDrive() != nullptr)
-    {
-        if (getSelectedDrive()->state == Drive::SHRED_ACTIVE || getSelectedDrive()->state == Drive::DELETE_ACTIVE)
-        {
-            getSelectedDrive()->state = Drive::NONE;
-            Logger::logThis()->info("Abort-Shred-Signal for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
-            // task for drive is running --> remove selection
-        }
-    }
-}
-
-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

@@ -2,21 +2,12 @@
  * @file    shred.cpp
  * @brief   shred drive
  * @author  hendrik schutter
- * @date    22.08.2022
+ * @date    03.05.2020
  */
 
 #include "../include/reHDD.h"
 
-#ifdef __cplusplus
+const static char *randomsrc = (char*) "/dev/urandom";
-extern "C"
-{
-#endif
-#include "../tfnoisegen/tfprng.h"
-#ifdef __cplusplus
-}
-#endif
-
-const static char *randomsrc = (char *)"/dev/urandom";
 
 Shred::Shred()
 {
@@ -31,183 +22,188 @@ Shred::~Shred()
  * \param	pointer of Drive instance
  * \return  void
  */
-int Shred::shredDrive(Drive *drive, int *ipSignalFd)
+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++)
+    for(int i = 0; i<=500; i++)
-    {
-        if (drive->state != Drive::SHRED_ACTIVE)
         {
-            return 0;
+            if(drive->state != Drive::SHRED_ACTIVE)
+                {
+                    return 0;
+                }
+            drive->setTaskPercentage(i+0.05);
+            write(*ipSignalFd, "A",1);
+            usleep(20000);
         }
-        drive->setTaskPercentage(i + 0.05);
-        write(*ipSignalFd, "A", 1);
-        usleep(20000);
-    }
-    drive->bWasShredded = true;
 #endif
 
 #ifndef DRYRUN
     const char *cpDrivePath = drive->getPath().c_str();
-    unsigned char ucKey[TFNG_KEY_SIZE];
 
-    // open random source
+    //open random source
     randomSrcFileDiscr = open(randomsrc, O_RDONLY | O_LARGEFILE);
     if (randomSrcFileDiscr == -1)
-    {
+        {
-        std::string errorMsg(strerror(randomSrcFileDiscr));
+            std::string errorMsg(strerror(randomSrcFileDiscr));
-        Logger::logThis()->error("Shred-Task: Open random source failed! " + errorMsg + " - Drive: " + drive->getSerial());
+            Logger::logThis()->error("Shred-Task: Open random source failed! " + errorMsg + " - Drive: " + drive->getSerial());
-        perror(randomsrc);
+            perror(randomsrc);
-        cleanup();
+            cleanup();
-        return -1;
+            return -1;
-    }
+        }
 
-    // open disk
+    //open disk
     driveFileDiscr = open(cpDrivePath, O_RDWR | O_LARGEFILE);
     if (driveFileDiscr == -1)
-    {
+        {
-        std::string errorMsg(strerror(driveFileDiscr));
+            std::string errorMsg(strerror(driveFileDiscr));
-        Logger::logThis()->error("Shred-Task: Open drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
+            Logger::logThis()->error("Shred-Task: Open drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
-        perror(cpDrivePath);
+            perror(cpDrivePath);
-        cleanup();
+            cleanup();
-        return -1;
+            return -1;
-    }
+        }
-
-    // read key for random generator
-    ssize_t readRet = read(randomSrcFileDiscr, ucKey, sizeof(ucKey));
-    if (readRet <= 0)
-    {
-        std::string errorMsg(strerror(readRet));
-        Logger::logThis()->error("Shred-Task: Read random key failed! " + errorMsg + " - Drive: " + drive->getSerial());
-        perror(randomsrc);
-        cleanup();
-        return -1;
-    }
-
-    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
+    unsigned long ulSpeedMetricBytesWritten = 0U; //uses to calculate speed metric
 
 #ifdef LOG_LEVEL_HIGH
     Logger::logThis()->info("Shred-Task: Bytes-Size of Drive: " + to_string(this->ulDriveByteSize) + " - Drive: " + drive->getSerial());
 #endif
 
     for (unsigned int uiShredIterationCounter = 0U; uiShredIterationCounter < SHRED_ITERATIONS; uiShredIterationCounter++)
-    {
-        unsigned long ulDriveByteCounter = 0U; // used for one shred-iteration to keep track of the current drive position
-
-        if (uiShredIterationCounter == (SHRED_ITERATIONS - 1))
         {
-            // last shred iteration --> overwrite (just the write chunk) bytes with zeros instead with random data
+            unsigned long ulDriveByteCounter = 0U; //used for one shred-iteration to keep track of the current drive position
-            memset(caTfngData, 0U, CHUNK_SIZE);
+            uint32_t u32ChunkDimensionIndex = 0U;
-        }
 
-        while (ulDriveByteCounter < ulDriveByteSize)
+/*
-        {
+            if(uiShredIterationCounter == (SHRED_ITERATIONS-1))
-            int iBytesToShred = 0; // Bytes that will be overwritten in this chunk-iteration
+                {
+                    //last shred iteration --> overwrite with zeros instead with random data
+                    memset(caChunk, 0U, CHUNK_DIMENSION*CHUNK_SIZE);
+                }
+                */
 
-            if (uiShredIterationCounter != (SHRED_ITERATIONS - 1))
+            while (ulDriveByteCounter < ulDriveByteSize)
-            {
+                {
-                // NOT last shred iteration --> generate new random data
+                    int iBytesToShred = 0; //Bytes that will be overwritten in this chunk-iteration
-                tfng_prng_genrandom(caTfngData, TFNG_DATA_SIZE);
-            }
 
-            if ((ulDriveByteSize - ulDriveByteCounter) < CHUNK_SIZE)
+                    if((u32ChunkDimensionIndex == 0U))
-            {
+                        {
-                iBytesToShred = (ulDriveByteSize - ulDriveByteCounter);
+                            //read new chunks from random source if needed and this is NOT the last shred iteration
-            }
+                            unsigned long ulBytesInChunkBuffer = 0U;
-            else
-            {
-                iBytesToShred = CHUNK_SIZE;
-            }
 
-            int iByteShredded = write(driveFileDiscr, caTfngData, iBytesToShred);
+                            while (ulBytesInChunkBuffer < CHUNK_DIMENSION*CHUNK_SIZE)
+                                {
+                                    //read new random bytes
+                                    int iReadBytes = read(randomSrcFileDiscr, caChunk, ((CHUNK_DIMENSION*CHUNK_SIZE)-ulBytesInChunkBuffer));
+                                    if (iReadBytes > 0)
+                                        {
+                                            ulBytesInChunkBuffer += iReadBytes;
+                                        }
+                                    else
+                                        {
+                                            std::string errorMsg(strerror(iReadBytes));
+                                            Logger::logThis()->error("Shred-Task: Read from random source failed! " + errorMsg + " - Drive: " + drive->getSerial());
+                                            perror("unable to read random data");
+                                            cleanup();
+                                            return -1;;
+                                        }
+                                } //end chunk read
+#ifdef LOG_LEVEL_HIGH
+                            Logger::logThis()->info("Shred-Task: Read new random data - Drive: " + drive->getSerial());
+#endif
 
-            if (iByteShredded <= 0)
+                        }
-            {
-                std::string errorMsg(strerror(iByteShredded));
-                Logger::logThis()->error("Shred-Task: Write to drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
-                perror("unable to write random data");
-                cleanup();
-                return -1;
-            }
 
-            ulDriveByteCounter += iByteShredded;
+                    if((ulDriveByteSize-ulDriveByteCounter) < CHUNK_SIZE)
-            ulDriveByteOverallCount += iByteShredded;
+                        {
-            d32Percent = this->calcProgress();
+                            iBytesToShred = (ulDriveByteSize-ulDriveByteCounter);
-            drive->sShredSpeed.ulSpeedMetricBytesWritten += iByteShredded;
+                        }
+                    else
+                        {
+                            iBytesToShred = CHUNK_SIZE;
+                        }
+
+                    int iByteShredded = write(driveFileDiscr, caChunk[u32ChunkDimensionIndex], iBytesToShred);
+
+                    if(iByteShredded <= 0)
+                        {
+                            std::string errorMsg(strerror(iByteShredded));
+                            Logger::logThis()->error("Shred-Task: Write to drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
+                            perror("unable to write random data");
+                            cleanup();
+                            return -1;
+                        }
+
+                    u32ChunkDimensionIndex = (u32ChunkDimensionIndex+1)%CHUNK_DIMENSION;
+                    ulDriveByteCounter += iByteShredded;
+                    ulDriveByteOverallCount += iByteShredded;
+                    d32Percent = this->calcProgress();
+                    ulSpeedMetricBytesWritten += iByteShredded;
 
 #ifdef LOG_LEVEL_HIGH
-            Logger::logThis()->info("Shred-Task: ByteCount: " + to_string(ulDriveByteCounter) + " - iteration: " + to_string((uiShredIterationCounter + 1)) + " - progress: " + to_string(d32Percent) + " - Drive: " + drive->getSerial());
+                    Logger::logThis()->info("Shred-Task: ByteCount: " + to_string(ulDriveByteCounter) +  " - iteration: " + to_string((uiShredIterationCounter+1)) + " - progress: " + to_string(d32Percent) + " - Drive: " + drive->getSerial());
 #endif
-            if ((d32Percent - d32TmpPercent) >= 0.01)
+                    if((d32Percent-d32TmpPercent) >= 0.01)
-            {
+                        {
-                // set shred percantage
+                            //set shred percantage
-                drive->setTaskPercentage(d32TmpPercent);
+                            drive->setTaskPercentage(d32TmpPercent);
-                d32TmpPercent = d32Percent;
+                            d32TmpPercent = d32Percent;
-                // signal process in shreding
-                write(*ipSignalFd, "A", 1);
-            }
 
-            if (drive->state != Drive::SHRED_ACTIVE)
+                            //set metrics for calculating shred speed
-            {
+                            std::chrono::time_point<std::chrono::system_clock> chronoCurrentTimestamp = std::chrono::system_clock::now();
-                drive->setTaskPercentage(0);
+                            drive->sShredSpeed.u32ShredTimeDelta = (chronoCurrentTimestamp - drive->sShredSpeed.chronoShredTimestamp).count();
-                d32Percent = 0.00;
+                            drive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();
-                d32TmpPercent = 0.00;
+                            drive->sShredSpeed.ulWrittenBytes = ulSpeedMetricBytesWritten;
-                ulDriveByteCounter = 0U;
+                            ulSpeedMetricBytesWritten = 0U;
-                Logger::logThis()->info("Aborted shred  for: " + drive->getModelName() + "-" + drive->getSerial());
-                cleanup();
-                return -1;
-            }
-            // end one chunk write
-        }
-        if (0 != iRewindDrive(driveFileDiscr))
-        {
-            Logger::logThis()->error("Shred-Task: Unable to rewind drive! - Drive: " + drive->getSerial());
-            cleanup();
-            return -1;
-        }
-        // end one shred iteration
-    }
-    // end of all shred iteratio
 
-    tfng_prng_seedkey(NULL); // reset random generator
+                            //signal process in shreding
+                            write(*ipSignalFd, "A",1);
+                        }
 
-    drive->bWasShredded = true;
+                    if(drive->state != Drive::SHRED_ACTIVE)
-    Logger::logThis()->info("Shred-Task finished - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
+                        {
-#ifdef ZERO_CHECK
+                            drive->setTaskPercentage(0);
-    drive->state = Drive::CHECK_ACTIVE;
+                            d32Percent = 0.00;
-    Logger::logThis()->info("Check-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
+                            d32TmpPercent = 0.00;
-    drive->u32DriveChecksumAfterShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd);
+                            ulDriveByteCounter = 0U;
+                            Logger::logThis()->info("Aborted shred  for: " + drive->getModelName() + "-" +  drive->getSerial());
+                            cleanup();
+                            return -1;
+                        }
+                }//end one chunk write
+            if(0 != iRewindDrive(driveFileDiscr))
+                {
+                    cleanup();
+                    return -1;
+                }
+        } //end one shred iteration
+
+#ifdef ZERO_CHECK_ALERT
+    drive->u32DriveChecksumAferShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd);
 #ifdef LOG_LEVEL_HIGH
     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
 #endif
 
     cleanup();
 
-    if ((drive->state == Drive::SHRED_ACTIVE) || (drive->state == Drive::CHECK_ACTIVE))
+    if(drive->state == Drive::SHRED_ACTIVE)
-    {
+        {
-        drive->state = Drive::NONE;
+            drive->bWasShredded = true;
-        drive->setTaskPercentage(0.0);
+            drive->state= Drive::NONE;
-        Printer::getPrinter()->print(drive);
+            drive->setTaskPercentage(0.0);
-        Logger::logThis()->info("Finished shred/check for: " + drive->getModelName() + "-" + drive->getSerial());
+            Logger::logThis()->info("Finished shred for: " + drive->getModelName() + "-" +  drive->getSerial());
-    }
+        }
     return 0;
 }
 /**
@@ -220,33 +216,33 @@ 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
+    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;
+    return (double) (((double) ulDriveByteOverallCount) / ((double)this->ulDriveByteSize*uiMaxShredIteration))*100.0f;
 }
 
 int Shred::iRewindDrive(fileDescriptor file)
 {
-    if (0 != lseek(file, 0L, SEEK_SET))
+    if(0 != lseek(file, 0L, SEEK_SET))
-    {
+        {
-        perror("unable to rewind drive");
+            perror("unable to rewind drive");
-        return -1;
+            return -1;
-    }
+        }
     else
-    {
+        {
-        return 0;
+            return 0;
-    }
+        }
 }
 
 unsigned long Shred::getDriveSizeInBytes(fileDescriptor file)
 {
     unsigned long ulDriveSizeTmp = lseek(file, 0L, SEEK_END);
 
-    if (0 != iRewindDrive(file))
+    if(0 != iRewindDrive(file))
-    {
+        {
-        ulDriveSizeTmp = 0U;
+            ulDriveSizeTmp = 0U;
-    }
+        }
 
 #ifdef DEMO_DRIVE_SIZE
     ulDriveSizeTmp = DEMO_DRIVE_SIZE;
@@ -254,51 +250,44 @@ unsigned long Shred::getDriveSizeInBytes(fileDescriptor file)
     return ulDriveSizeTmp;
 }
 
-unsigned int Shred::uiCalcChecksum(fileDescriptor file, Drive *drive, int *ipSignalFd)
+unsigned int Shred::uiCalcChecksum(fileDescriptor file,Drive* drive, int* ipSignalFd)
 {
     unsigned int uiChecksum = 0;
     unsigned long ulDriveByteCounter = 0U;
     while (ulDriveByteCounter < ulDriveByteSize)
-    {
-        int iBytesToCheck = 0;
-        if ((ulDriveByteSize - ulDriveByteCounter) < CHUNK_SIZE)
         {
-            iBytesToCheck = (ulDriveByteSize - ulDriveByteCounter);
+            int iBytesToCheck = 0;
-        }
+            if((ulDriveByteSize-ulDriveByteCounter) < CHUNK_SIZE)
-        else
+                {
-        {
+                    iBytesToCheck = (ulDriveByteSize-ulDriveByteCounter);
-            iBytesToCheck = CHUNK_SIZE;
+                }
-        }
+            else
-        int iReadBytes = read(file, caReadBuffer, iBytesToCheck);
+                {
-        for (int iReadBytesCounter = 0U; iReadBytesCounter < iReadBytes; iReadBytesCounter++)
+                    iBytesToCheck = CHUNK_SIZE;
-        {
+                }
-            uiChecksum += caReadBuffer[iReadBytesCounter];
+            int iReadBytes = read(file, caChunk, iBytesToCheck);
-        }
+            for (int iReadBytesCounter = 0U; iReadBytesCounter < iReadBytes; iReadBytesCounter++)
-        ulDriveByteCounter += iReadBytes;
+                {
-        ulDriveByteOverallCount += iReadBytes;
+                    uiChecksum += caChunk[0][iReadBytesCounter];
-        d32Percent = this->calcProgress();
+                }
-        drive->sShredSpeed.ulSpeedMetricBytesWritten += iReadBytes;
+            ulDriveByteCounter += iReadBytes;
-
+            ulDriveByteOverallCount += iReadBytes;
+            d32Percent = this->calcProgress();
 #ifdef LOG_LEVEL_HIGH
-        Logger::logThis()->info("Shred-Task (Checksum): ByteCount: " + to_string(ulDriveByteCounter) + " - progress: " + to_string(d32Percent) + " - Drive: " + drive->getSerial());
+            Logger::logThis()->info("Shred-Task (Checksum): ByteCount: " + to_string(ulDriveByteCounter) + " - progress: " + to_string(d32Percent) + " - Drive: " + drive->getSerial());
 #endif
-
+            if((d32Percent-d32TmpPercent) >= 0.9)
-        if (((d32Percent - d32TmpPercent) >= 0.01) || (d32Percent == 100.0))
+                {
-        {
+                    drive->setTaskPercentage(d32TmpPercent);
-            drive->setTaskPercentage(d32TmpPercent);
+                    d32TmpPercent = d32Percent;
-            d32TmpPercent = d32Percent;
+                    write(*ipSignalFd, "A",1);
-#ifdef LOG_LEVEL_HIGH
+                }
-            Logger::logThis()->info("send progress signal to main loop (check)");
-#endif
-            write(*ipSignalFd, "A", 1);
         }
-    }
-    drive->bWasChecked = true;
     return uiChecksum;
 }
 
 void Shred::cleanup()
 {
     close(driveFileDiscr);
-    close(randomSrcFileDiscr);
+    close( randomSrcFileDiscr);
 }

src/smart.cpp

@@ -7,279 +7,172 @@
 
 #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;
+
 /**
  * \brief   get and set S.M.A.R.T. values in Drive
  * \param	pointer of Drive instance
  * \return  void
  */
-void SMART::readSMARTData(Drive *drive)
+void SMART::readSMARTData(Drive* drive)
 {
-    string modelFamily;
-    string modelName;
-    string serial;
-    uint64_t capacity = 0U;
-    uint32_t errorCount = 0U;
-    uint32_t powerOnHours = 0U;
-    uint32_t powerCycles = 0U;
-    uint32_t temperature = 0U;
-
     modelFamily.clear();
     modelName.clear();
     serial.clear();
+    capacity = 0U;
+    errorCount = 0U;
+    powerOnHours = 0U;
+    powerCycle = 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 ");
-    {
+    sCMD.append(drive->getPath());
-        string sCMD = ("smartctl");
+    const char* cpComand = sCMD.c_str();
-        sCMD.append(sSmartctlCommand);
-        sCMD.append(drive->getPath());
-        const char *cpComand = sCMD.c_str();
 
-        //Logger::logThis()->info(cpComand);
+    FILE* outputfileSmart = popen(cpComand, "r");
 
-        FILE *outputfileSmart = popen(cpComand, "r");
+    while ((getline(&cLine, &len, outputfileSmart)) != -1)
-        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, temperature);
         }
-
+    pclose(outputfileSmart);
-        pclose(outputfileSmart);
+    drive->setDriveSMARTData(modelFamily, modelName, serial, capacity, errorCount, powerOnHours, powerCycle); //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	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)
+    if (found!=string::npos)
-    {
+        {
-        sLine.erase(0U, sLine.find(": ") + 3U);
+            sLine.erase(0, sLine.find(": ") + 3);
-        sLine.erase(sLine.length() - 3U, 3U);
+            sLine.erase(sLine.length()-3, 3);
-        modelFamily = sLine;
+            modelFamily = sLine;
-        return true;
+        }
-    }
-    else
-    {
-        return false;
-    }
 }
 
 /**
- * \brief parse ModelName
+ * \brief   parse ModelName
- * \param string output line of smartctl
+ * \param	string output line of smartctl
- * \param string parsed model name
+ * \return  void
- * \return bool if parsing was possible
  */
-bool SMART::parseModelName(string sLine, string &modelName)
+void SMART::parseModelName(string sLine)
 {
     string search("\"model_name\": ");
     size_t found = sLine.find(search);
-    if (found != string::npos)
+    if (found!=string::npos)
-    {
+        {
-        sLine.erase(0U, sLine.find(": ") + 3U);
+            sLine.erase(0, sLine.find(": ") + 3);
-        sLine.erase(sLine.length() - 3U, 3U);
+            sLine.erase(sLine.length()-3, 3);
-        modelName = sLine;
+            modelName = sLine;
-        return true;
+        }
-    }
-    else
-    {
-        return false;
-    }
 }
 
 /**
- * \brief parse Serial
+ * \brief   parse Serial
- * \param string output line of smartctl
+ * \param	string output line of smartctl
- * \param string parsed serial
+ * \return  void
- * \return bool if parsing was possible
  */
-bool SMART::parseSerial(string sLine, string &serial)
+void SMART::parseSerial(string sLine)
 {
     string search("\"serial_number\": ");
     size_t found = sLine.find(search);
-    if (found != string::npos)
+    if (found!=string::npos)
-    {
+        {
-        sLine.erase(0, sLine.find(": ") + 3);
+            sLine.erase(0, sLine.find(": ") + 3);
-        sLine.erase(sLine.length() - 3, 3);
+            sLine.erase(sLine.length()-3, 3);
-        serial = sLine;
+            serial = sLine;
-        return true;
+        }
-    }
-    else
-    {
-        return false;
-    }
 }
 
 /**
- * \brief parse Capacity
+ * \brief   parse Capacity
- * \param string output line of smartctl
+ * \param	string output line of smartctl
- *  \param string parsed capacity
+ * \return  void
- * \return bool if parsing was possible
  */
-bool SMART::parseCapacity(string sLine, uint64_t &capacity)
+void SMART::parseCapacity(string sLine)
 {
     string search("\"bytes\": ");
     size_t found = sLine.find(search);
-    if (found != string::npos)
+    if (found!=string::npos)
-    {
+        {
-        sLine.erase(0, sLine.find(": ") + 2);
+            sLine.erase(0, sLine.find(": ") + 2);
-        sLine.erase(sLine.length() - 1, 1);
+            sLine.erase(sLine.length()-1, 1);
-        capacity = stol(sLine);
+            capacity = stol(sLine);
-        return true;
+        }
-    }
-    else
-    {
-        return false;
-    }
 }
 
 /**
- * \brief parse ErrorCount
+ * \brief   parse ErrorCount
- * \param string output line of smartctl
+ * \param	string output line of smartctl
- * \param uint32_t parsed error count
+ * \return  void
- * \return bool if parsing was possible
  */
-bool SMART::parseErrorCount(string sLine, uint32_t &errorCount)
+void SMART::parseErrorCount(string sLine)
 {
     string search("\"error_count_total\": ");
     size_t found = sLine.find(search);
-    if (found != string::npos)
+    if (found!=string::npos)
-    {
+        {
-        sLine.erase(0U, sLine.find(": ") + 2U);
+            sLine.erase(0, sLine.find(": ")+2);
-        sLine.erase(sLine.length() - 2U, 2U);
+            sLine.erase(sLine.length()-2, 2);
-        errorCount = stol(sLine);
+            errorCount = stol(sLine);
-        return true;
+        }
-    }
-    else
-    {
-        return false;
-    }
 }
 
 /**
- * \brief parse PowerOnHours
+ * \brief   parse PowerOnHours
- * \param string output line of smartctl\
+ * \param	string output line of smartctl
- * \param uint32_t parsed power on hours
+ * \return  void
- * \return bool if parsing was possible
  */
-bool SMART::parsePowerOnHours(string sLine, uint32_t &powerOnHours)
+void SMART::parsePowerOnHours(string sLine)
 {
     string search("\"hours\": ");
     size_t found = sLine.find(search);
-    if (found != string::npos)
+    if (found!=string::npos)
-    {
+        {
-        sLine.erase(0U, sLine.find(": ") + 2U);
+            sLine.erase(0, sLine.find(": ") + 2);
-        sLine.erase(sLine.length() - 1U, 1U);
+            sLine.erase(sLine.length()-1, 1);
-        powerOnHours = stol(sLine);
+            powerOnHours = stol(sLine);
-        return true;
+
-    }
+        }
-    else
-    {
-        return false;
-    }
 }
 
 /**
- * \brief parse PowerCycle
+ * \brief   parse PowerCycle
- * \param string output line of smartctl
+ * \param	string output line of smartctl
- * \param uint32_t parsed power cycles
+ * \return  void
- * \return bool if parsing was possible
  */
-bool SMART::parsePowerCycles(string sLine, uint32_t &powerCycles)
+void SMART::parsePowerCycle(string sLine)
 {
     string search("\"power_cycle_count\": ");
     size_t found = sLine.find(search);
-    if (found != string::npos)
+    if (found!=string::npos)
-    {
+        {
-        sLine.erase(0, sLine.find(": ") + 2);
+            sLine.erase(0, sLine.find(": ") + 2);
-        sLine.erase(sLine.length() - 2, 2);
+            sLine.erase(sLine.length()-2, 2);
-        powerCycles = stol(sLine);
+            powerCycle = stol(sLine);
-        return true;
+
-    }
+        }
-    else
-    {
-        return false;
-    }
 }
 
-/**
- * \brief parse temperature
- * \param string output line of smartctl
- * \param uint32_t parsed temperature
- * \return bool if parsing was possible
- */
-bool SMART::parseTemperature(string sLine, uint32_t &temperature)
-{
-    string search("\"current\": ");
-    size_t found = sLine.find(search);
-    if (found != string::npos)
-    {
-        sLine.erase(0U, sLine.find(": ") + 2U);
-        sLine.erase(sLine.length() - 1U, 2U);
-        if (sLine == "{")
-        {
-            temperature = 0U; // this drive doesn't support temperature
-        }
-        else
-        {
-            temperature = stol(sLine);
-        }
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}

src/tui.cpp

@@ -23,233 +23,200 @@ void TUI::initTUI()
 {
     initscr();
     raw();
-    keypad(stdscr, TRUE);
+    keypad(stdscr,TRUE);
-    if (has_colors() == TRUE)
+    if(has_colors() == TRUE)
-    {
+        {
-        start_color();
+            start_color();
-    }
+        }
     else
-    {
+        {
-        printf("Your terminal does not support color\n");
+            printf("Your terminal does not support color\n");
-        Logger::logThis()->error("Your terminal does not support color");
+            Logger::logThis()->error("Your terminal does not support color");
-        exit(1);
+            exit(1);
-    }
+        }
     clear();
     curs_set(0);
     noecho();
     cbreak();
-    init_pair(COLOR_AREA_STDSCR, COLOR_WHITE, COLOR_BLUE);
+    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");
 }
 
-void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
+void TUI::updateTUI(list <Drive>* plistDrives, uint8_t u8SelectedEntry)
 {
     mxUIrefresh.lock();
     uint16_t u16StdscrX, u16StdscrY;
     getmaxyx(stdscr, u16StdscrY, u16StdscrX);
 
-    init_pair(COLOR_AREA_STDSCR, COLOR_WHITE, COLOR_BLUE);
+    init_pair(COLOR_AREA_STDSCR,COLOR_WHITE, COLOR_BLUE);
     wbkgd(stdscr, COLOR_PAIR(COLOR_AREA_STDSCR));
 
     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);
 
-    list<Drive>::iterator it;
+    list <Drive>::iterator it;
     uint8_t u8Index = 0U;
     for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-    {
-        string sModelFamily = it->getModelFamily();
-        string sSerial = "SN: " + it->getSerial();
-        string sCapacity = it->sCapacityToText();
-        string sState = " ";
-        string sSpeed = " ";
-        string sTime = " ";
-        string sTemp = it->sTemperatureToText();
-
-        bool bSelectedEntry = false;
-
-        if (u8SelectedEntry == u8Index)
         {
-            bSelectedEntry = true; // mark this drive in entries list
+            string sModelFamily = it->getModelFamily();
-            displaySelectedDrive(*it, u16StdscrX, u16StdscrY);
+            string sModelName = it->getModelName();
+            string sCapacity = it->sCapacityToText();
+            string sState = " ";
+            string sSpeed = " ";
+            string sTime = " ";
 
-            if ((it->getPowerOnHours() >= WORSE_HOURS) || (it->getPowerCycles() >= WORSE_POWERUP) || (it->getErrorCount() > 0) || (it->getTemperature() >= WORSE_TEMPERATURE))
+            bool bSelectedEntry = false;
-            {
-                // smart values are bad --> show warning
-                smartWarning = createSmartWarning(50, 10, ((u16StdscrX) - (int)(u16StdscrX / 2) + 35), (int)(u16StdscrY / 2) - 5, it->getPath(), it->getPowerOnHours(), it->getPowerCycles(), it->getErrorCount(), it->getTemperature());
-                wrefresh(smartWarning);
-            }
-        }
 
-        stringstream stream;
+            if(u8SelectedEntry == u8Index)
-
-        switch (it->state)
-        {
-        case Drive::SHRED_ACTIVE:
-
-            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);
-            break;
-        case Drive::DELETE_ACTIVE:
-            sState = "Deleting ...";
-            it->calculateTaskDuration();
-            sTime = this->formatTimeDuration(it->getTaskDuration());
-            break;
-        case Drive::NONE:
-        case Drive::SHRED_SELECTED:
-        case Drive::DELETE_SELECTED:
-            if (it->bWasDeleted)
-            {
-                sState = "DELETED"; // mark drive as deleted previously
-            }
-            if (it->bWasShredded)
-            {
-                if (it->bWasChecked)
                 {
-                    // drive was also checked after shredding
+                    bSelectedEntry = true; //mark this drive in entries list
-                    sState = "SHREDDED & CHECKED"; // mark drive as shredded previously and optional checked
+                    displaySelectedDrive(*it, u16StdscrX, u16StdscrY);
-                }
-                else
-                {
-                    // shredded and not checked yet
-                    sState = "SHREDDED"; // mark drive as shredded previously
-                }
-                sTime = this->formatTimeDuration(it->getTaskDuration());
-            }
 
-#ifdef ZERO_CHECK
+                    if((it->getPowerOnHours() >= WORSE_HOURS) || (it->getPowerCycles() >= WORSE_POWERUP) || (it->getErrorCount() > 0))
-            if (bSelectedEntry && it->bWasChecked && (it->u32DriveChecksumAfterShredding != 0U))
+                        {
-            {
+                            // smart values are bad --> show warning
-                dialog = createZeroChecksumWarning(70, 16, ((u16StdscrX) - (int)(u16StdscrX / 2) - 20), (int)(u16StdscrY / 2) - 8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial(), it->u32DriveChecksumAfterShredding);
+                            smartWarning=createSmartWarning(50, 10, ((u16StdscrX)-(int)(u16StdscrX/2)+35),(int)(u16StdscrY/2)-5, it->getPath(), it->getPowerOnHours(), it->getPowerCycles(), it->getErrorCount());
-                wrefresh(dialog);
+                            wrefresh(smartWarning);
-            }
+                        }
+                }
+
+            stringstream stream;
+
+
+            switch (it->state)
+                {
+                case Drive::SHRED_ACTIVE:
+
+                    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::DELETE_ACTIVE:
+                    sState = "Deleting ...";
+                    it->calculateTaskDuration();
+                    sTime = this->formatTimeDuration(it->getTaskDuration());
+                    break;
+
+                case Drive::NONE:
+                case Drive::SHRED_SELECTED:
+                case Drive::DELETE_SELECTED:
+                    if (it->bWasDeleteted)
+                        {
+                            sState = "DELETED"; //mark drive as deleted previously
+                        }
+                    if (it->bWasShredded)
+                        {
+                            sState = "SHREDDED"; //mark drive as shreded previously, overwrite if deleted
+                            sTime = this->formatTimeDuration(it->getTaskDuration());
+                        }
+
+#ifdef ZERO_CHECK_ALERT
+                    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->u32DriveChecksumAferShredding);
+                            wrefresh(dialog);
+                        }
 #endif
 
-            break;
+                    break;
-        case Drive::FROZEN:
+                case Drive::FROZEN:
-            stream << fixed << setprecision(3) << (it->getTaskPercentage());
+                    stream << fixed << setprecision(3) << (it->getTaskPercentage());
 #ifdef FROZEN_ALERT
-            if (bSelectedEntry)
+                    if(bSelectedEntry)
-            {
+                        {
-                dialog = createFrozenWarning(70, 16, ((u16StdscrX) - (int)(u16StdscrX / 2) - 20), (int)(u16StdscrY / 2) - 8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial(), stream.str() + "%");
+                            dialog=createFrozenWarning(70, 16, ((u16StdscrX)-(int)(u16StdscrX/2)-20),(int)(u16StdscrY/2)-8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial(), stream.str() + "%");
-                wrefresh(dialog);
+                            wrefresh(dialog);
-            }
+                        }
 #endif
-            sState = "FROZEN " + stream.str() + "%"; // mark drive as frozen and reached progress
+                    sState = "FROZEN " + stream.str() + "%"; //mark drive as frozen and reached progress
-            break;
+                    break;
-        default:
+                default:
-            break;
+                    break;
+                }
+
+            WINDOW * tmp = createEntryWindow( ((int)(u16StdscrX/3) - 2), 5, 3, (5* (u8Index) )+3, sModelFamily, sModelName, sCapacity, sState, sTime, sSpeed, bSelectedEntry);
+            wrefresh(tmp);
+            u8Index++;
+        }//end loop though drives
+
+    if(plistDrives->size() == 0)
+        {
+            //no selected drive present
+            Logger::logThis()->warning("no selected drive present");
+            struct MenuState menustate;
+            menustate.bAbort = false;
+            menustate.bConfirmDelete = false;
+            menustate.bConfirmShred =  false;
+            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);
+            wrefresh(detailview);
         }
 
-        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
-
-    if (plistDrives->size() == 0)
-    {
-        // no selected drive present
-        Logger::logThis()->warning("no selected drive present");
-        struct MenuState menustate;
-        menustate.bAbort = false;
-        menustate.bConfirmDelete = false;
-        menustate.bConfirmShred = false;
-        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));
-        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();
 }
 
 enum TUI::UserInput TUI::readUserInput()
 {
     int ch = wgetch(stdscr);
-    switch (ch)
+    switch(ch)
-    {
+        {
-    case KEY_UP:
+        case KEY_UP:
-        return TUI::UserInput::UpKey;
+            return TUI::UserInput::UpKey;
-        break;
+            break;
-    case KEY_DOWN:
+        case KEY_DOWN:
-        return TUI::UserInput::DownKey;
+            return TUI::UserInput::DownKey;
-        break;
+            break;
-    case 10:
+        case 10:
-        return TUI::UserInput::Enter;
+            return TUI::UserInput::Enter;
-        break;
+            break;
-    case 27:
+        case 27:
-        return TUI::UserInput::ESC;
+            return TUI::UserInput::ESC;
-        break;
+            break;
-    case 'a':
+        case 'a':
-        return TUI::UserInput::Abort;
+            return TUI::UserInput::Abort;
-        break;
+            break;
-    case 'd':
+        case 'd':
-        return TUI::UserInput::Delete;
+            return TUI::UserInput::Delete;
-        break;
+            break;
-    case 's':
+        case 's':
-        return TUI::UserInput::Shred;
+            return TUI::UserInput::Shred;
-        break;
+            break;
-    case 'S':
+        default:
-        return TUI::UserInput::ShredAll;
+            return TUI::UserInput::Undefined;
-        break;
+            break;
-    default:
+        }
-        return TUI::UserInput::Undefined;
-        break;
-    }
     return TUI::UserInput::Undefined;
 }
 
-void TUI::centerTitle(WINDOW *pwin, const char *title)
+void TUI::centerTitle(WINDOW *pwin, const char * title)
 {
     int x, maxX, stringSize;
     getmaxyx(pwin, maxX, maxX);
     stringSize = 4 + strlen(title);
-    x = (maxX - stringSize) / 2;
+    x = (maxX - stringSize)/2;
     mvwaddch(pwin, 0, x, ACS_RTEE);
     waddch(pwin, ' ');
     waddstr(pwin, title);
@@ -257,13 +224,10 @@ void TUI::centerTitle(WINDOW *pwin, const char *title)
     waddch(pwin, ACS_LTEE);
 }
 
-/*
+WINDOW* TUI::createOverViewWindow( int iXSize, int iYSize)
-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);
@@ -273,147 +237,107 @@ WINDOW *TUI::createOverViewWindow(int iXSize, int iYSize)
     return newWindow;
 }
 
-WINDOW *TUI::createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive drive)
+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);
 
     string title = "Selected Drive: " + drive.getModelName() + " " + drive.sCapacityToText();
     centerTitle(newWindow, title.c_str());
 
-    string sPath = "Path:          " + drive.getPath();
+    string sPath =  "Path:          " +drive.getPath();
-    string sModelFamily = "ModelFamily:   " + drive.getModelFamily();
+    string sModelFamlily = "ModelFamily:   " + drive.getModelFamily();
-    string sModelName = "ModelName:     " + drive.getModelName();
+    string sModelName =  "ModelName:     " + drive.getModelName();
-    string sCapacity = "Capacity:      " + drive.sCapacityToText();
+    string sCapacity =  "Capacity:      " + drive.sCapacityToText();
-    string sSerial = "Serial:        " + drive.getSerial();
+    string sSerial =  "Serial:        " + drive.getSerial();
     string sPowerOnHours = "PowerOnHours:  " + drive.sPowerOnHoursToText();
-    string sPowerCycle = "PowerCycle:    " + drive.sPowerCyclesToText();
+    string sPowerCycle =  "PowerCycle:    " + drive.sPowerCyclesToText();
-    string sErrorCount = "ErrorCount:    " + drive.sErrorCountToText();
+    string sErrorCount =  "ErrorCount:    " + drive.sErrorCountToText();
 
     uint16_t u16Line = 2;
 
-    mvwaddstr(newWindow, u16Line++, 3, sPath.c_str());
+    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, sModelName.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sCapacity.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sCapacity.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sSerial.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sSerial.c_str());
 
     attroff(COLOR_PAIR(COLOR_AREA_DETAIL));
 
-    mvwaddstr(newWindow, u16Line++, 3, sPowerOnHours.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sPowerOnHours.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sPowerCycle.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sPowerCycle.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sErrorCount.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sErrorCount.c_str());
 
     return newWindow;
 }
 
-WINDOW *TUI::overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart)
+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);
 
     string title = "About this tool";
     centerTitle(newWindow, title.c_str());
 
-    string sLine01 = "reHDD - hard drive refurbishing tool";
+    string sLine01 =  "reHDD - hard drive refurbishing tool";
-    string sLine02 = "Version: " + string(REHDD_VERSION);
+    string sLine02 =  "Version: " + string(REHDD_VERSION);
-    string sLine03 = "Available under GPL 3.0";
+    string sLine03 =  "Available under GPL 3.0";
-    string sLine04 = "https://git.mosad.xyz/localhorst/reHDD";
+    string sLine04 =  "https://git.mosad.xyz/localhorst/reHDD";
-    string sLine05 = "Delete: Wipe format table - this is NOT secure";
+    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;
 
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLine01.c_str());
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine01.c_str());
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine02.size() / 2), sLine02.c_str());
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine02.size()/2), sLine02.c_str());
     u16Line++;
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine03.size() / 2), sLine03.c_str());
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine03.size()/2), sLine03.c_str());
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine04.size() / 2), sLine04.c_str());
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine04.size()/2), sLine04.c_str());
     u16Line++;
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine05.size() / 2), sLine05.c_str());
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine05.size()/2), sLine05.c_str());
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine06.size() / 2), sLine06.c_str());
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine06.size()/2), sLine06.c_str());
 
     attroff(COLOR_PAIR(COLOR_AREA_DETAIL));
 
     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, bool bSelected)
+WINDOW* TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, string sModelFamily, string sModelName, string sCapacity, string sState, string sTime, string sSpeed, bool bSelected)
 {
     WINDOW *newWindow;
     newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
 
-    if (!bSelected)
+    if(!bSelected)
-    {
-        // entry is NOT selected
-        if (iListIndex % 2 == 0)
         {
-            // even
+            // entry is NOT selected
-            attron(COLOR_PAIR(COLOR_AREA_ENTRY_EVEN));
+            attron(COLOR_PAIR(COLOR_AREA_ENTRY));
-            wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY_EVEN));
+            wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY));
         }
-        else
-        {
-            // odd
-            attron(COLOR_PAIR(COLOR_AREA_ENTRY_ODD));
-            wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY_ODD));
-        }
-    }
     else
-    {
+        {
-        // entry IS selected
+            // entry IS selected
-        attron(COLOR_PAIR(COLOR_AREA_ENTRY_SELECTED));
+            attron(COLOR_PAIR(COLOR_AREA_ENTRY));
-        wbkgd(newWindow, 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);
 
-    // index number
+    mvwaddstr(newWindow,1, 1, sModelFamily.c_str());
-    mvwaddstr(newWindow, 0, 1, to_string(iListIndex).c_str());
+    mvwaddstr(newWindow,2, 1, sModelName.c_str());
+    mvwaddstr(newWindow,3, 1, sCapacity.c_str());
 
-    /*
+    mvwaddstr(newWindow,1, iXSize-sSpeed.length()-5, sSpeed.c_str());
-    70 chars in x-axis
+    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;
 }
 
-WINDOW *TUI::createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart)
+WINDOW* TUI::createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart)
 {
     WINDOW *newWindow;
     newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
@@ -424,37 +348,31 @@ WINDOW *TUI::createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart)
     centerTitle(newWindow, "System");
 
     time_t rawtime;
-    struct tm *timeinfo;
+    struct tm * timeinfo;
     char buffer[80];
-    time(&rawtime);
+    time (&rawtime);
     timeinfo = localtime(&rawtime);
-    strftime(buffer, sizeof(buffer), "Date: %d-%m-%Y   Time: %H:%M", timeinfo);
+    strftime(buffer,sizeof(buffer),"Date: %d-%m-%Y   Time: %H:%M",timeinfo);
     string time(buffer);
 
-    string sLine01 = "reHDD - hard drive refurbishing tool";
+    string sLine01 =  "reHDD - hard drive refurbishing tool";
-    string sLine02 = "Version: " + string(REHDD_VERSION);
+    string sLine02 =  "Version: " + string(REHDD_VERSION);
-    string sLine03 = "Build time: ";
+    string sLine03 =  "Available under GPL 3.0";
-    sLine03.append(__DATE__);
+    string sLine04 =  "https://git.mosad.xyz/localhorst/reHDD";
-    sLine03.append(" ");
-    sLine03.append(__TIME__);
-    string sLine04 = "Available under GPL 3.0";
-    string sLine05 = "https://git.mosad.xyz/localhorst/reHDD";
 
     uint16_t u16Line = 2;
 
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLine01.c_str());
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine01.c_str());
+    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());
     u16Line++;
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLine02.c_str());
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), time.c_str());
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLine03.c_str());
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLine04.c_str());
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLine05.c_str());
-    u16Line++;
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), time.c_str());
 
     return newWindow;
 }
 
-WINDOW *TUI::createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, struct MenuState menustate)
+WINDOW* TUI::createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, struct MenuState menustate)
 {
     WINDOW *newWindow;
     newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
@@ -464,30 +382,30 @@ 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)
+    if(menustate.bAbort)
-    {
+        {
-        string sLineTmp = "Press a for Abort";
+            string sLineTmp = "Press A for Abort";
-        mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLineTmp.size() / 2), sLineTmp.c_str());
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLineTmp.size()/2), sLineTmp.c_str());
-        u16Line++;
+            u16Line++;
-    }
+        }
-    if (menustate.bShred)
+    if(menustate.bShred)
-    {
+        {
-        string sLineTmp = "Press s for Shred (S for all drives)";
+            string sLineTmp = "Press S for Shred ";
-        mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLineTmp.size() / 2), sLineTmp.c_str());
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLineTmp.size()/2), sLineTmp.c_str());
-        u16Line++;
+            u16Line++;
-    }
+        }
-    if (menustate.bDelete)
+    if(menustate.bDelete)
-    {
+        {
-        string sLineTmp = "Press d for Delete";
+            string sLineTmp = "Press D for Delete";
-        mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLineTmp.size() / 2), sLineTmp.c_str());
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLineTmp.size()/2), sLineTmp.c_str());
-    }
+        }
 
     return newWindow;
 }
 
-WINDOW *TUI::createDialog(int iXSize, int iYSize, int iXStart, int iYStart, string task, string optionA, string optionB)
+WINDOW* TUI::createDialog(int iXSize, int iYSize, int iXStart, int iYStart, string task, string optionA, string optionB)
 {
     WINDOW *newWindow;
     newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
@@ -498,14 +416,14 @@ WINDOW *TUI::createDialog(int iXSize, int iYSize, int iXStart, int iYStart, stri
     centerTitle(newWindow, task.c_str());
 
     uint16_t u16Line = 3;
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (optionA.size() / 2), optionA.c_str());
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(optionA.size()/2), optionA.c_str());
     u16Line++;
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (optionB.size() / 2), optionB.c_str());
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(optionB.size()/2), optionB.c_str());
 
     return newWindow;
 }
 
-WINDOW *TUI::createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, string sProgress)
+WINDOW* TUI::createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, string sProgress)
 {
     WINDOW *newWindow;
     newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
@@ -516,10 +434,10 @@ WINDOW *TUI::createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStar
     string sHeader = "Drive " + sPath + " is frozen";
     string sLine01 = "Please detach this drive and check it manually:";
     string sShredState = "Shredding stopped after " + sProgress;
-    string sLinePath = "Path:          " + sPath;
+    string sLinePath =  "Path:          " +sPath;
     string sLineModelFamlily = "ModelFamily:   " + sModelFamily;
-    string sLineModelName = "ModelName:     " + sModelName;
+    string sLineModelName =  "ModelName:     " + sModelName;
-    string sLineSerial = "Serial:        " + sSerial;
+    string sLineSerial =  "Serial:        " + sSerial;
 
     string sLine02 = "reHDD was not able to write data to the drive.";
     string sLine03 = "This can be caused by an malfunctioning drive.";
@@ -527,21 +445,21 @@ WINDOW *TUI::createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStar
     centerTitle(newWindow, sHeader.c_str());
 
     uint16_t u16Line = 2;
-    mvwaddstr(newWindow, u16Line++, 3, sLine01.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLine01.c_str());
     u16Line++;
-    mvwaddstr(newWindow, u16Line++, 3, sLinePath.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLinePath.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sLineModelFamlily.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLineModelFamlily.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sLineModelName.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLineModelName.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sLineSerial.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLineSerial.c_str());
     u16Line++;
-    mvwaddstr(newWindow, u16Line++, 3, sLine02.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLine02.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sLine03.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLine03.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sShredState.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sShredState.c_str());
 
     return newWindow;
 }
 
-WINDOW *TUI::createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, uint32_t u32Checksum)
+WINDOW* TUI::createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, uint32_t u32Checksum)
 {
     WINDOW *newWindow;
     newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
@@ -552,10 +470,10 @@ WINDOW *TUI::createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int
     string sHeader = "Drive " + sPath + " is NOT successfully shredded!";
     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 sLinePath =  "Path:          " +sPath;
-    string sLineModelFamily = "ModelFamily:   " + sModelFamily;
+    string sLineModelFamlily = "ModelFamily:   " + sModelFamily;
-    string sLineModelName = "ModelName:     " + sModelName;
+    string sLineModelName =  "ModelName:     " + sModelName;
-    string sLineSerial = "Serial:        " + sSerial;
+    string sLineSerial =  "Serial:        " + sSerial;
 
     string sLine02 = "reHDD was not able to write zero into every byte on the drive.";
     string sLine03 = "This can be caused by an malfunctioning drive.";
@@ -563,16 +481,16 @@ WINDOW *TUI::createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int
     centerTitle(newWindow, sHeader.c_str());
 
     uint16_t u16Line = 2;
-    mvwaddstr(newWindow, u16Line++, 3, sLine01.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLine01.c_str());
     u16Line++;
-    mvwaddstr(newWindow, u16Line++, 3, sLinePath.c_str());
+    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, sLineModelName.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sLineSerial.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLineSerial.c_str());
     u16Line++;
-    mvwaddstr(newWindow, u16Line++, 3, sLine02.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLine02.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sLine03.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLine03.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sShredChecksum.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sShredChecksum.c_str());
 
     return newWindow;
 }
@@ -580,12 +498,12 @@ WINDOW *TUI::createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int
 string TUI::formatTimeDuration(time_t u32Duration)
 {
     std::ostringstream out;
-    int dy = (int)((u32Duration) / 86400);
+    int dy=(int)((u32Duration)/86400);
-    int hr = (int)(((u32Duration) / 3600) % 24);
+    int hr=(int)(((u32Duration)/3600)%24);
-    int min = ((int)((u32Duration) / 60)) % 60;
+    int min=((int)((u32Duration)/60))%60;
-    int sec = (int)((u32Duration) % 60);
+    int sec=(int)((u32Duration)%60);
     char s[25];
-    sprintf(s, "%02d:%02d:%02d:%02d", dy, hr, min, sec);
+    sprintf(s, "%02d:%02d:%02d:%02d", dy,  hr, min, sec);
     out << s;
     return out.str();
 }
@@ -593,92 +511,72 @@ string TUI::formatTimeDuration(time_t u32Duration)
 string TUI::formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes)
 {
     std::ostringstream out;
-    double dDeltaSec = ((double)((u32ShredTimeDelta) / 1000000000.0)); // convert nano in sec
+    double dDeltaSec = ((double)((u32ShredTimeDelta)/1000000000.0)); //convert nano in sec
-    double speed = ((ulWrittenBytes / 1000000.0) / dDeltaSec);
+    double speed = ((ulWrittenBytes/1000000.0)/dDeltaSec);
     char s[25];
     sprintf(s, "%0.2lf MB/s", speed);
     out << s;
     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;
+    menustate.bConfirmShred =  false;
     menustate.bDelete = false;
     menustate.bShred = false;
 
     // set menustate based on drive state
     switch (drive.state)
-    {
+        {
-    case Drive::NONE: // no task running or selected for this drive
+        case Drive::NONE: //no task running or selected for this drive
-        menustate.bShred = true;
+            menustate.bShred = true;
-        menustate.bDelete = true;
+            menustate.bDelete = true;
-        break;
+            break;
-    case Drive::DELETE_ACTIVE: // delete task running for this drive
+        case Drive::DELETE_ACTIVE : //delete task running for this drive
-        menustate.bAbort = true;
+            menustate.bAbort = true;
-        break;
+            break;
 
-    case Drive::SHRED_ACTIVE: // shred task running for this drive
+        case Drive::SHRED_ACTIVE : //shred task running for this drive
-        menustate.bAbort = true;
+            menustate.bAbort = true;
-        break;
+            break;
 
-    case Drive::CHECK_ACTIVE: // check task running for this drive
+        case Drive::DELETE_SELECTED : //delete task selected for this drive
-        menustate.bAbort = true;
+            menustate.bConfirmDelete = true;
-        break;
+            break;
 
-    case Drive::DELETE_SELECTED: // delete task selected for this drive
+        case Drive::SHRED_SELECTED : //shred task selected for this drive
-        menustate.bConfirmDelete = true;
+            menustate.bConfirmShred = true;
-        break;
+            break;
+        default:
+            break;
+        }
 
-    case Drive::SHRED_SELECTED: // shred task selected for this drive
+    detailview=createDetailViewWindow(((stdscrX)-(int)(stdscrX/3)-7), (stdscrY-15), (int)(stdscrX/3)+5, drive);
-        menustate.bConfirmShred = true;
-        break;
-    default:
-        break;
-    }
-
-    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 * (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)
+    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");
+            dialog=createDialog(40, 10, ((stdscrX)-(int)(stdscrX/3)-7)-(int)((stdscrX/3)+5)/2,(int)(stdscrY/2)-5, "Confirm SHRED", "Press ENTER for SHRED", "Press ESC for cancel");
-        wrefresh(dialog);
+            wrefresh(dialog);
-        dialogIsActive = true;
+        }
-    }
+    else if(menustate.bConfirmDelete == true)
-    else if (menustate.bConfirmDelete == true)
+        {
-    {
+            dialog=createDialog(40, 10, ((stdscrX)-(int)(stdscrX/3)-7)-(int)((stdscrX/3)+5)/2,(int)(stdscrY/2)-5, "Confirm DELETE", "Press ENTER for DELETE", "Press ESC for cancel");
-        dialog = createDialog(40, 10, ((stdscrX) - (int)(stdscrX / 3) - 7) - (int)((stdscrX / 3) + 5) / 2, (int)(stdscrY / 2) - 5, "Confirm DELETE", "Press ENTER for DELETE", "Press ESC for cancel");
+            wrefresh(dialog);
-        wrefresh(dialog);
+        }
-        dialogIsActive = true;
-    }
     else
-    {
-        if (dialogIsActive)
         {
             delwin(dialog);
-            dialogIsActive = false;
         }
-    }
 }
 
-WINDOW *TUI::createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles, uint32_t u32ErrorCount, uint32_t u32Temperature)
+WINDOW* TUI::createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles,  uint32_t u32ErrorCount)
 {
     WINDOW *newWindow;
     newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
@@ -692,34 +590,27 @@ WINDOW *TUI::createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart
     centerTitle(newWindow, sHeader.c_str());
 
     uint16_t u16Line = 2;
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLine01.c_str());
+    mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine01.c_str());
     u16Line++;
 
-    if (u32PowerOnHours > WORSE_HOURS)
+    if(u32PowerOnHours > WORSE_HOURS)
-    {
+        {
-        string sLineTmp = "Operating hours exceeded " + to_string(WORSE_HOURS) + " hours: " + to_string(u32PowerOnHours);
+            string sLineTmp = "Operating hours exceeded " + to_string(WORSE_HOURS) + " hours: " + to_string(u32PowerOnHours);
-        mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLineTmp.c_str());
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLineTmp.c_str());
-        u16Line++;
+            u16Line++;
-    }
+        }
 
-    if (u32PowerCycles > WORSE_POWERUP)
+    if(u32PowerCycles > WORSE_POWERUP)
-    {
+        {
-        string sLineTmp = "Power-on exceeded " + to_string(WORSE_POWERUP) + " cycles: " + to_string(u32PowerCycles);
+            string sLineTmp = "Power-on exceeded " + to_string(WORSE_POWERUP) + " cycles: " + to_string(u32PowerCycles);
-        mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLineTmp.c_str());
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLineTmp.c_str());
-        u16Line++;
+            u16Line++;
-    }
+        }
 
-    if (u32ErrorCount > 0)
+    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());
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLineTmp.c_str());
-        u16Line++;
+        }
-    }
-
-    if (u32Temperature >= WORSE_TEMPERATURE)
-    {
-        string sLineTmp = "Drive too hot: " + to_string(u32Temperature) + " C";
-        mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLineTmp.c_str());
-    }
     return newWindow;
-}
+}

tfnoisegen

@@ -1 +0,0 @@
-Subproject commit 488716ef22ac5a1aae235a59bea2997ac7e8e45a