random

.gitignore

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

.gitmodules

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

README.md

@@ -1,45 +1,34 @@
 # reHDD
 
-## Features:
-* show S.M.A.R.T values of attached drives
-* checking used drives for their next live based on threshold limits
-* delete a drive instant with wipefs
+## Useful for:
+* checking new drives for the first time
+* checking used drives for their next live
 * 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")
 
-## openSUSE Build Notes
+## Debian Build Notes
 
-* `zypper install ncurses-devel git make gcc-c++`
-* `git submodule init`
-* `git submodule update`
+* `apt-get install ncurses-dev git make g++`
 * `make release`
 
-## Enable Label Printer ##
+## Create Standalone with Debian 11
 
-Just install [reHDDPrinter](https://git.mosad.xyz/localhorst/reHDDPrinter).
-No further settings needed.
+Instructions how to create a standalone machine that boots directly to reHDD. This is aimed for production use, like several drives a day shredding.
+* Start reHDD after boot without login (as a tty1 shell)
+* Start dmesg after boot without login (as a tty2 shell)
+* Start htop after boot without login (as a tty3 shell)
+* Upload reHDD log every 12h if wanted
 
 ### Software requirements
-* `zypper 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`
@@ -48,7 +37,7 @@ git submodule update
 
 If you want to upload the logs, edit `scripts/reHDDLogUploader.bash` with your nextcloud token
 
-Add ignored drives in `/root/reHDD/ignoreDrives.conf` like:
+Add your system drive in `/root/reHDD/ignoreDrives.conf` like:
 ```e102f49d```
 Get the first 8 Bytes from your UUID via `blkid /dev/sdX`
 

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);
 
 private:
     Delete(void);
+
 };
 
 #endif  // DELETE_H_

include/drive.h

@@ -14,114 +14,73 @@ class Drive
 {
 
 public:
-    enum class TaskState
-    {
-        NONE,
+    enum TaskState {NONE,
                     SHRED_SELECTED,
-        SHRED_ACTIVE, // shred iterations active
-        CHECK_ACTIVE, // optional checking active
-        CHECK_SUCCESSFUL,
-        CHECK_FAILED,
+                    SHRED_ACTIVE,
                     DELETE_SELECTED,
                     DELETE_ACTIVE,
                     FROZEN
-    };
+                   } state;
 
-    enum class ConnectionType
-    {
-        UNKNOWN,
-        USB,
-        SATA,
-        NVME
-    };
-
-    struct ShredSpeed
+    struct
     {
         time_t u32ShredTimeDelta;
-        std::chrono::time_point<std::chrono::system_clock>
-            chronoShredTimestamp;
+        std::chrono::time_point<std::chrono::system_clock> chronoShredTimestamp;
         unsigned long ulWrittenBytes;
-        unsigned long ulSpeedMetricBytesWritten;
-    };
+    } sShredSpeed;
 
-    std::atomic<TaskState> state;
-    std::atomic<ConnectionType> connectionType;
-    std::atomic<ShredSpeed> sShredSpeed;
-
-    bool bWasShredded = false;     // all shred iterations done
-    bool bWasShredStarted = false; // shred was atleast once started
-    bool bWasChecked = false;      // all shred iterations and optional checking done
-    bool bWasDeleted = false;
+    bool bWasShredded = false;
+    bool bWasDeleteted = false;
     bool bIsOffline = false;
-    uint32_t u32DriveChecksumAfterShredding = 0U;
-    uint16_t u16DriveIndex = 0U; // Index of TUI list
+    uint32_t u32DriveChecksumAferShredding = 0U;
 
 private:
-    std::string sPath;
+    string sPath;
+    string sModelFamily;
+    string sModelName;
+    string sSerial;
+    uint64_t u64Capacity = 0U; //in byte
+    uint32_t u32ErrorCount = 0U;
+    uint32_t u32PowerOnHours = 0U; //in hours
+    uint32_t u32PowerCycles = 0U;
     time_t u32Timestamp = 0U; //unix timestamp for detecting a frozen drive
     double d32TaskPercentage = 0U; //in percent for Shred (1 to 100)
     time_t u32TimestampTaskStart = 0U; //unix timestamp for duration of an action
     time_t u32TaskDuration = 0U; //time needed to complete the task
 
-    struct
-    {
-        std::string sModelFamily;
-        std::string sModelName;
-        std::string sSerial;
-        uint64_t u64Capacity = 0U; // in byte
-        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:
-    // Copy constructor
-    Drive(const Drive &other);
-
-    // Copy assignment operator
-    Drive &operator=(const Drive &other);
-
-    // Move constructor
-    Drive(Drive &&other) noexcept;
-
-    // Move assignment operator
-    Drive &operator=(Drive &&other) noexcept;
-
-    Drive(std::string path)
+    Drive(string path)
     {
         this->sPath = path;
     }
 
-    std::string getPath(void);
-    std::string getModelFamily(void);
-    std::string getModelName(void);
-    std::string getSerial(void);
+    string getPath(void);
+    string getModelFamily(void);
+    string getModelName(void);
+    string getSerial(void);
     uint64_t getCapacity(void); //in byte
     uint32_t getErrorCount(void);
     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(std::string modelFamily,
-                           std::string modelName,
-                           std::string serial,
+    void setDriveSMARTData( string modelFamily,
+                            string modelName,
+                            string serial,
                             uint64_t capacity,
                             uint32_t errorCount,
                             uint32_t powerOnHours,
-                           uint32_t powerCycles,
-                           uint32_t temperature);
+                            uint32_t powerCycles);
 
-    std::string sCapacityToText();
-    std::string sErrorCountToText();
-    std::string sPowerOnHoursToText();
-    std::string sPowerCyclesToText();
-    std::string sTemperatureToText();
+    string sCapacityToText();
+    string sErrorCountToText();
+    string sPowerOnHoursToText();
+    string sPowerCyclesToText();
 
     void setTaskPercentage(double d32TaskPercentage);
     double getTaskPercentage(void);
@@ -131,6 +90,7 @@ public:
 
     void calculateTaskDuration();
     time_t getTaskDuration();
+
 };
 
 #endif  // DRIVE_H_

include/logger/logger.h

@@ -16,10 +16,6 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
-#include <ifaddrs.h>
-#include <netpacket/packet.h>
-#include <cstring>
-#include <string>
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
@@ -72,6 +68,7 @@ private:
     ~Logger();
 
 public:
+
     void info(string s);
     void warning(string s);
     void error(string s);

include/printer.h

@@ -1,56 +0,0 @@
-/**
- * @file    printer.h
- * @brief   Send drive data to printer service using ipc msg queue
- * @author  Hendrik Schutter
- * @date    24.11.2022
- */
-
-#ifndef PRINTER_H_
-#define PRINTER_H_
-
-#include "reHDD.h"
-
-#include <sys/ipc.h>
-#include <sys/msg.h>
-
-#define STR_BUFFER_SIZE 64U
-#define IPC_MSG_QUEUE_KEY 0x1B11193C0
-
-typedef struct
-{
-    char caDriveIndex[STR_BUFFER_SIZE];
-    char caDriveHours[STR_BUFFER_SIZE];
-    char caDriveCycles[STR_BUFFER_SIZE];
-    char caDriveErrors[STR_BUFFER_SIZE];
-    char caDriveShredTimestamp[STR_BUFFER_SIZE];
-    char caDriveShredDuration[STR_BUFFER_SIZE];
-    char caDriveCapacity[STR_BUFFER_SIZE];
-    char caDriveState[STR_BUFFER_SIZE];
-    char caDriveConnectionType[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,21 +8,19 @@
 #ifndef REHDD_H_
 #define REHDD_H_
 
-#define REHDD_VERSION "V1.3.0"
+#define REHDD_VERSION "bV0.2.2"
 
 // Drive handling Settings
 #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_TEMPERATURE 55 // mark drive if at this limit or beyond
-#define SHRED_ITERATIONS 3U
-#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
+#define SHRED_ITERATIONS 1U
+#define FROZEN_TIMEOUT 10 //After this timeout (minutes) the drive will be marked as frozen
 
 // Logger Settings
 #define LOG_PATH "./reHDD.log"
-#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2025"
+#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2022"
 #define DEVICE_ID  "generic"
-#define SOFTWARE_VERSION REHDD_VERSION
+#define SOFTWARE_VERSION  "alpha"
 #define HARDWARE_VERSION  "generic"
 
 //#define LOG_LEVEL_HIGH  //log everything, like drive scan thread
@@ -31,9 +29,9 @@
 #endif
 
 // Logic
-// #define DRYRUN       // don't touch the drives
+//#define DRYRUN //don´t touch the drives
 #define FROZEN_ALERT //show alert if drive is frozen
-#define ZERO_CHECK   // check drive after shred if all bytes are zero, show alert if this fails
+#define ZERO_CHECK_ALERT //check drive after shred if all bytes are zero, show alert if this fails
 
 //IPC pipes
 #define READ 0
@@ -56,19 +54,19 @@
 #include <sstream>
 #include <iomanip>
 #include <signal.h>
-#include <atomic>
+
+using namespace std;
+
 #include "drive.h"
 #include "smart.h"
 #include "shred.h"
 #include "delete.h"
 #include "tui.h"
-#include "printer.h"
 #include "logger/logger.h"
 
 extern Logger* logging;
 
-template <typename T, typename I>
-T *iterator_to_pointer(I i)
+template <typename T, typename I> T* iterator_to_pointer(I i)
 {
     return (&(*i));
 }
@@ -76,33 +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 startShredAllDrives(list<Drive> *plistDrives);
-    static void stopShredAllDrives(list<Drive> *plistDrives);
-    static void updateShredMetrics(list<Drive> *plistDrives);
     static  void filterIgnoredDrives(list <Drive>* plistDrives);
-    static void filterInvalidDrives(list<Drive> *plistDrives);
     static void filterNewDrives(list <Drive>* plistOldDrives, list <Drive>* plistNewDrives);
     static void addSMARTData(list <Drive>* plistDrives);
-    static void printAllDrives(list<Drive> *plistDrives);
-    static void printDrive(Drive *const pDrive);
-    static void ThreadScanDevices();
+    static void ThreadScannDevices();
     static void ThreadUserInput();
-    static void ThreadShred(Drive *const pDrive);
-    static void ThreadDelete(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 bool getSystemDrive(string &systemDrive);
 };
 
 #endif  // REHDD_H_

include/shred.h

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

include/smart.h

@@ -13,21 +13,28 @@
 class SMART
 {
 protected:
+
 public:
     static void readSMARTData(Drive* drive);
 
 private:
     SMART(void);
 
-    static bool parseExitStatus(std::string sLine, uint8_t &status);
-    static bool parseModelFamily(std::string sLine, std::string &modelFamily);
-    static bool parseModelName(std::string sLine, std::string &modelName);
-    static bool parseSerial(std::string sLine, std::string &serial);
-    static bool parseCapacity(std::string sLine, uint64_t &capacity);
-    static bool parseErrorCount(std::string sLine, uint32_t &errorCount);
-    static bool parsePowerOnHours(std::string sLine, uint32_t &powerOnHours);
-    static bool parsePowerCycles(std::string sLine, uint32_t &powerCycles);
-    static bool parseTemperature(std::string sLine, uint32_t &temperature);
+    static void parseModelFamily(string sLine);
+    static void parseModelName(string sLine);
+    static void parseSerial(string sLine);
+    static void parseCapacity(string sLine);
+    static void parseErrorCount(string sLine);
+    static void parsePowerOnHours(string sLine);
+    static void parsePowerCycle(string sLine);
+
+    static  string modelFamily;
+    static  string modelName;
+    static  string serial;
+    static  uint64_t capacity;
+    static  uint32_t errorCount;
+    static  uint32_t powerOnHours;
+    static  uint32_t powerCycle;
 };
 
 #endif  // SMART_H_

include/tui.h

@@ -12,30 +12,17 @@
 
 #define COLOR_AREA_STDSCR 1
 #define COLOR_AREA_OVERVIEW 2
-#define COLOR_AREA_ENTRY_EVEN 3
-#define COLOR_AREA_ENTRY_ODD 4
-#define COLOR_AREA_ENTRY_SELECTED 5
-#define COLOR_AREA_DETAIL 6
+#define COLOR_AREA_ENTRY 3
+#define COLOR_AREA_ENTRY_SELECTED 4
+#define COLOR_AREA_DETAIL 5
 
 class TUI
 {
 protected:
+
 public:
-    enum UserInput
-    {
-        UpKey,
-        DownKey,
-        Abort,
-        Shred,
-        ShredAll,
-        Delete,
-        Enter,
-        ESC,
-        Terminate,
-        Print,
-        PrintAll,
-        Undefined
-    };
+
+    enum UserInput { UpKey, DownKey, Abort, Shred, Delete, Enter, ESC, Undefined};
     struct MenuState
     {
         bool bAbort;
@@ -49,16 +36,14 @@ public:
 
     static void initTUI();
 
-    void updateTUI(std::list<Drive> *plistDrives, uint8_t u8SelectedEntry);
+    void updateTUI(list <Drive>* plistDrives,  uint8_t u8SelectedEntry);
 
     static enum UserInput readUserInput();
 
-    static void terminateTUI();
-
 private:
-    static std::string sCpuUsage;
-    static std::string sRamUsage;
-    static std::string sLocalTime;
+    static string sCpuUsage;
+    static string sRamUsage;
+    static string sLocalTime;
 
     WINDOW* overview;
     WINDOW* systemview;
@@ -69,19 +54,19 @@ private:
 
     static void centerTitle(WINDOW *pwin, const char * title);
     static WINDOW *createOverViewWindow( int iXSize, int iYSize);
-    static WINDOW *createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive &drive);
+    static WINDOW *createDetailViewWindow( int iXSize, int iYSize, int iXStart, Drive drive);
     static WINDOW *overwriteDetailViewWindow( int iXSize, int iYSize, int iXStart);
-    static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, std::string sModelFamily, std::string sSerial, std::string sCapacity, std::string sState, std::string sTime, std::string sSpeed, std::string sTemp, std::string sConnection, 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, std::string selectedTask, std::string optionA, std::string optionB);
-    static WINDOW *createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, std::string sPath, std::string sModelFamily, std::string sModelName, std::string sSerial, std::string sProgress);
-    static WINDOW *createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart, std::string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles, uint32_t u32ErrorCount, uint32_t u32Temperature);
-    static WINDOW *createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int iYStart, std::string sPath, std::string sModelFamily, std::string sModelName, std::string sSerial, uint32_t u32Checksum);
+    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* 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);
+
+    void displaySelectedDrive(Drive drive, int stdscrX, int stdscrY);
+    string formatTimeDuration(time_t u32Duration);
+    string formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes);
 
-    void displaySelectedDrive(Drive &drive, int stdscrX, int stdscrY);
-    std::string formatTimeDuration(time_t u32Duration);
-    std::string formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes);
-    static void vTruncateText(std::string *psText, uint16_t u16MaxLenght);
 };
 #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 -latomic
-
+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
@@ -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

@@ -6,7 +6,6 @@
  */
 
 #include "../include/reHDD.h"
-using namespace std;
 
 /**
  * \brief   delete drive with wipefs
@@ -33,17 +32,11 @@ void Delete::deleteDrive(Drive *drive)
     const char* cpComand = sCMD.c_str();
     //cout << "delete: " << cpComand << endl;
 
-    if (drive->bWasShredStarted == false)
-    {
-        // only start delete if the drive was not shredded before
     FILE* deleteCmdOutput = popen(cpComand, "r");
 
     while ((getline(&cLine, &len, deleteCmdOutput)) != -1)
         {
             //wipefs running
         }
-
-        free(cLine);
     pclose(deleteCmdOutput);
 }
-}

src/drive.cpp

@@ -6,95 +6,6 @@
  */
 
 #include "../include/reHDD.h"
-using namespace std;
-
-// Copy constructor
-Drive::Drive(const Drive &other)
-    : state(other.state.load()),
-      connectionType(other.connectionType.load()),
-      sShredSpeed(other.sShredSpeed.load()),
-      bWasShredded(other.bWasShredded),
-      bWasShredStarted(other.bWasShredStarted),
-      bWasChecked(other.bWasChecked),
-      bWasDeleted(other.bWasDeleted),
-      bIsOffline(other.bIsOffline),
-      u32DriveChecksumAfterShredding(other.u32DriveChecksumAfterShredding),
-      sPath(other.sPath),
-      u32Timestamp(other.u32Timestamp),
-      d32TaskPercentage(other.d32TaskPercentage),
-      u32TimestampTaskStart(other.u32TimestampTaskStart),
-      u32TaskDuration(other.u32TaskDuration),
-      sSmartData(other.sSmartData)
-{
-}
-
-// Copy assignment operator
-Drive &Drive::operator=(const Drive &other)
-{
-    if (this != &other)
-    {
-        state = other.state.load();
-        connectionType = other.connectionType.load();
-        sShredSpeed = other.sShredSpeed.load();
-        bWasShredded = other.bWasShredded;
-        bWasShredStarted = other.bWasShredStarted;
-        bWasChecked = other.bWasChecked;
-        bWasDeleted = other.bWasDeleted;
-        bIsOffline = other.bIsOffline;
-        u32DriveChecksumAfterShredding = other.u32DriveChecksumAfterShredding;
-        sPath = other.sPath;
-        u32Timestamp = other.u32Timestamp;
-        d32TaskPercentage = other.d32TaskPercentage;
-        u32TimestampTaskStart = other.u32TimestampTaskStart;
-        u32TaskDuration = other.u32TaskDuration;
-        sSmartData = other.sSmartData;
-    }
-    return *this;
-}
-
-// Move constructor
-Drive::Drive(Drive &&other) noexcept
-    : state(other.state.load()),
-      connectionType(other.connectionType.load()),
-      sShredSpeed(other.sShredSpeed.load()),
-      bWasShredded(other.bWasShredded),
-      bWasShredStarted(other.bWasShredStarted),
-      bWasChecked(other.bWasChecked),
-      bWasDeleted(other.bWasDeleted),
-      bIsOffline(other.bIsOffline),
-      u32DriveChecksumAfterShredding(other.u32DriveChecksumAfterShredding),
-      sPath(std::move(other.sPath)),
-      u32Timestamp(other.u32Timestamp),
-      d32TaskPercentage(other.d32TaskPercentage),
-      u32TimestampTaskStart(other.u32TimestampTaskStart),
-      u32TaskDuration(other.u32TaskDuration),
-      sSmartData(std::move(other.sSmartData))
-{
-}
-
-// Move assignment operator
-Drive &Drive::operator=(Drive &&other) noexcept
-{
-    if (this != &other)
-    {
-        state = other.state.load();
-        connectionType = other.connectionType.load();
-        sShredSpeed = other.sShredSpeed.load();
-        bWasShredded = other.bWasShredded;
-        bWasShredStarted = other.bWasShredStarted;
-        bWasChecked = other.bWasChecked;
-        bWasDeleted = other.bWasDeleted;
-        bIsOffline = other.bIsOffline;
-        u32DriveChecksumAfterShredding = other.u32DriveChecksumAfterShredding;
-        sPath = std::move(other.sPath);
-        u32Timestamp = other.u32Timestamp;
-        d32TaskPercentage = other.d32TaskPercentage;
-        u32TimestampTaskStart = other.u32TimestampTaskStart;
-        u32TaskDuration = other.u32TaskDuration;
-        sSmartData = std::move(other.sSmartData);
-    }
-    return *this;
-}
 
 string Drive::getPath(void)
 {
@@ -103,41 +14,36 @@ 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;
-}
-
-uint32_t Drive::getTemperature(void)
-{
-    return sSmartData.u32Temperature;
+    return u32PowerCycles;
 }
 
 string Drive::sCapacityToText()
@@ -151,12 +57,8 @@ string Drive::sCapacityToText()
             dSize /= 1000;
             u16UnitIndex++;
         }
-    if (u16UnitIndex >= 9)
-    {
-        u16UnitIndex = 8;
-    }
-    int precision = (u16UnitIndex >= 3) ? (u16UnitIndex - 3) : 0;
-    sprintf(acBuffer, "%.*f %s", precision, dSize, units[u16UnitIndex]);
+
+    sprintf(acBuffer, "%.*f %s", u16UnitIndex-3, dSize, units[u16UnitIndex]);
     return acBuffer;
 }
 
@@ -165,6 +67,7 @@ string Drive::sErrorCountToText()
     return to_string(getErrorCount());
 }
 
+
 string Drive::sPowerOnHoursToText()
 {
     double dDays = 0U;
@@ -189,11 +92,6 @@ string Drive::sPowerCyclesToText()
     return to_string(getPowerCycles());
 }
 
-string Drive::sTemperatureToText()
-{
-    return to_string(getTemperature()) + " C";
-}
-
 void Drive::setTaskPercentage(double d32TaskPercentage)
 {
     if(d32TaskPercentage <= 100)
@@ -207,6 +105,7 @@ double Drive::getTaskPercentage(void)
     return this->d32TaskPercentage;
 }
 
+
 /**
  * \brief   set S.M.A.R.T. values in model
  * \param	string modelFamily
@@ -216,7 +115,6 @@ 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,
@@ -225,35 +123,26 @@ void Drive::setDriveSMARTData(string modelFamily,
                                uint64_t capacity,
                                uint32_t errorCount,
                                uint32_t powerOnHours,
-                              uint32_t powerCycle,
-                              uint32_t temperature)
+                               uint32_t powerCycle)
 {
-    this->sSmartData.sModelFamily = modelFamily;
-    this->sSmartData.sModelName = modelName;
-    this->sSmartData.sSerial = serial;
-    this->sSmartData.u64Capacity = capacity;
-    this->sSmartData.u32ErrorCount = errorCount;
-    this->sSmartData.u32PowerOnHours = powerOnHours;
-    this->sSmartData.u32PowerCycles = powerCycle;
-    this->sSmartData.u32Temperature = temperature;
+    this->sModelFamily = modelFamily;
+    sModelName = modelName;
+    sSerial = serial;
+    u64Capacity = capacity;
+    u32ErrorCount = errorCount;
+    u32PowerOnHours = powerOnHours;
+    u32PowerCycles = powerCycle;
+
 }
 
 void Drive::setTimestamp()
 {
-    if (time(&this->u32Timestamp) == -1)
-    {
-        // handle error
-        this->u32Timestamp = 0U;
-    }
+    time(&this->u32Timestamp);
 }
 
 void Drive::setActionStartTimestamp()
 {
-    if (time(&this->u32TimestampTaskStart) == -1)
-    {
-        // handle error
-        this->u32TimestampTaskStart = 0U;
-    }
+    time(&this->u32TimestampTaskStart);
 }
 
 time_t Drive::getActionStartTimestamp()
@@ -264,11 +153,7 @@ time_t Drive::getActionStartTimestamp()
 void Drive::calculateTaskDuration()
 {
     time_t u32localtime;
-    if (time(&u32localtime) == -1)
-    {
-        // handle error
-        u32localtime = 0U;
-    }
+    time(&u32localtime);
 
     this->u32TaskDuration = u32localtime - this->u32TimestampTaskStart;
 }
@@ -282,17 +167,12 @@ void Drive::checkFrozenDrive(void)
 {
     time_t u32localtime;
     time(&u32localtime);
-    if (time(&u32localtime) == -1)
-    {
-        // handle error
-        u32localtime = 0U;
-    }
 
-    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());
-        this->bWasDeleted = false;
+            this->bWasDeleteted = false;
             this->bWasShredded = false;
-        this->state = Drive::TaskState::FROZEN;
+            this->state = Drive::FROZEN;
         }
 }

src/logger/logger.cpp

@@ -5,6 +5,7 @@
  * @date    04.09.2020
  */
 
+
 #include "../../include/reHDD.h" //for logger settings
 #include "../../include/logger/logger.h"
 
@@ -17,6 +18,8 @@ Logger *Logger::single = NULL;
 
 /**
  * \brief   create new logger instance
+ * \param	path to log file
+ * \param	struct with data
  * \return  instance of Logger
  */
 Logger::Logger()
@@ -134,7 +137,7 @@ string Logger::getTimestamp()
         }
     timeinfo = localtime(&tv.tv_sec);
     strftime (cpDate,80,"%d/%m/%Y %T",timeinfo);
-    snprintf(buffer, sizeof(buffer), "%s.%03d", cpDate, millisec);
+    sprintf(buffer, "%s.%03d", cpDate, millisec);
     return buffer;
 }
 
@@ -143,44 +146,25 @@ string Logger::getTimestamp()
  * \param	void
  * \return  string MAC address (formatted)
  */
-std::string Logger::getMacAddress()
+string Logger::getMacAddress()
 {
-    struct ifaddrs *ifaddr, *ifa;
+    struct ifreq ifr;
+    int s = socket(AF_INET, SOCK_STREAM,0);
 
-    // default MAC if none found
-    std::string result = "00:00:00:00:00:00";
-
-    if (getifaddrs(&ifaddr) == -1)
-        return result;
-
-    for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
+    strcpy(ifr.ifr_name, "eth0");
+    if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
         {
-        if (!ifa->ifa_addr)
-            continue;
+            strcpy(ifr.ifr_name, "eno1");
 
-        // We want AF_PACKET interfaces (Ethernet)
-        if (ifa->ifa_addr->sa_family == AF_PACKET &&
-            !(ifa->ifa_flags & IFF_LOOPBACK) && // skip loopback interface
-            (ifa->ifa_flags & IFF_UP))          // must be up
-        {
-            struct sockaddr_ll *s = (struct sockaddr_ll *)ifa->ifa_addr;
-
-            if (s->sll_halen == 6)
-            {
-                char buf[32];
-                snprintf(buf, sizeof(buf),
-                         "%02X:%02X:%02X:%02X:%02X:%02X",
-                         s->sll_addr[0], s->sll_addr[1], s->sll_addr[2],
-                         s->sll_addr[3], s->sll_addr[4], s->sll_addr[5]);
-
-                freeifaddrs(ifaddr);
-                return std::string(buf);
-            }
-        }
         }
 
-    freeifaddrs(ifaddr);
-    return result;
+    unsigned char *hwaddr = (unsigned char *)ifr.ifr_hwaddr.sa_data;
+    char buffer [80];
+    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;
+    return tmp;
 }
 
 /**
@@ -247,3 +231,5 @@ Logger *Logger::logThis()
             return single; //return existing obj
         }
 }
+
+

src/main.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "../include/reHDD.h"
-using namespace std;
 
 /**
  * \brief   app entry point
@@ -17,7 +16,7 @@ int main(void)
 {
     // cout << "refurbishingHddTool" << endl;
 
-    reHDD app;
-    app.app_logic();
+    reHDD* app = new reHDD();
+    app->app_logic();
     return EXIT_SUCCESS;
 }

src/printer.cpp

@@ -1,101 +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;
-
-    snprintf(msgQueueData.driveData.caDriveIndex, STR_BUFFER_SIZE, "%i", drive->u16DriveIndex);
-    snprintf(msgQueueData.driveData.caDriveState, STR_BUFFER_SIZE, "shredded");
-    snprintf(msgQueueData.driveData.caDriveModelFamily, STR_BUFFER_SIZE, "%s", drive->getModelFamily().c_str());
-    snprintf(msgQueueData.driveData.caDriveModelName, STR_BUFFER_SIZE, "%s", drive->getModelName().c_str());
-    snprintf(msgQueueData.driveData.caDriveCapacity, STR_BUFFER_SIZE, "%li", drive->getCapacity());
-    snprintf(msgQueueData.driveData.caDriveSerialnumber, STR_BUFFER_SIZE, "%s", drive->getSerial().c_str());
-    snprintf(msgQueueData.driveData.caDriveHours, STR_BUFFER_SIZE, "%i", drive->getPowerOnHours());
-    snprintf(msgQueueData.driveData.caDriveCycles, STR_BUFFER_SIZE, "%i", drive->getPowerCycles());
-    snprintf(msgQueueData.driveData.caDriveErrors, STR_BUFFER_SIZE, "%i", drive->getErrorCount());
-    snprintf(msgQueueData.driveData.caDriveShredTimestamp, STR_BUFFER_SIZE, "%li", drive->getActionStartTimestamp());
-    snprintf(msgQueueData.driveData.caDriveShredDuration, STR_BUFFER_SIZE, "%li", drive->getTaskDuration());
-
-    switch (drive->connectionType)
-    {
-    case Drive::ConnectionType::USB:
-        strncpy(msgQueueData.driveData.caDriveConnectionType, "usb", STR_BUFFER_SIZE);
-        break;
-    case Drive::ConnectionType::SATA:
-        strncpy(msgQueueData.driveData.caDriveConnectionType, "sata", STR_BUFFER_SIZE);
-        break;
-    case Drive::ConnectionType::NVME:
-        strncpy(msgQueueData.driveData.caDriveConnectionType, "nvme", STR_BUFFER_SIZE);
-        break;
-    case Drive::ConnectionType::UNKNOWN:
-    default:
-        strncpy(msgQueueData.driveData.caDriveConnectionType, "na", STR_BUFFER_SIZE);
-    }
-
-    snprintf(msgQueueData.driveData.caDriveReHddVersion, STR_BUFFER_SIZE, "%s", 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

@@ -6,21 +6,14 @@
  */
 
 #include "../include/reHDD.h"
-using namespace std;
 
 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 std::mutex mxDrives;
+static Drive* pDummyDrive;
 
-list<Drive> listNewDrives; // store found drives that are updated every 5sec
-
-static list<Drive> listDrives; // stores all drive data from scan thread
-
-TUI *ui;
-
-static uint16_t u16SelectedEntry;
+static  uint8_t u8SelectedEntry;
 
 static fd_set selectSet;
 
@@ -31,7 +24,7 @@ static fd_set selectSet;
  */
 reHDD::reHDD(void)
 {
-    u16SelectedEntry = 0U;
+    u8SelectedEntry = 0U;
 }
 
 /**
@@ -41,22 +34,15 @@ reHDD::reHDD(void)
  */
 void reHDD::app_logic(void)
 {
-    ui = new TUI();
-    ui->initTUI();
+    pDummyDrive = new Drive("/dev/sdc");
+    pDummyDrive->state = Drive::NONE;
+    pDummyDrive->bIsOffline = false;
 
-    if (pipe(fdNewDrivesInformPipe) == -1)
-    {
-        Logger::logThis()->error("Unable to open pipe 'fdNewDrivesInformPipe'");
-    }
+    pipe(fdNewDrivesInformPipe);
+    pipe(fdShredInformPipe);
 
-    if (pipe(fdShredInformPipe) == -1)
-    {
-        Logger::logThis()->error("Unable to open pipe 'fdShredInformPipe'");
-    }
-
-    thread thDevices(ThreadScanDevices);                 // start thread that scans for drives
-    thread thUserInput(ThreadUserInput);                 // start thread that reads user input
-    thread thCheckFrozenDrives(ThreadCheckFrozenDrives); // start thread that checks timeout for drives
+    getSelectedDrive()->state = Drive::TaskState::SHRED_ACTIVE;
+    thread(ThreadShred).detach();
 
     while(1)
         {
@@ -66,814 +52,40 @@ void reHDD::app_logic(void)
 
             select(FD_SETSIZE, &selectSet, NULL, NULL, NULL);
 
-        if (FD_ISSET(fdNewDrivesInformPipe[0], &selectSet))
-        {
-            mxDrives.lock();
-            char dummy;
-            read(fdNewDrivesInformPipe[0], &dummy, 1);
-            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
+
+                    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());
                 }
-        ui->updateTUI(&listDrives, u16SelectedEntry);
         } //endless loop
-    thDevices.join();
-    thUserInput.join();
-    thCheckFrozenDrives.join();
 }
 
 Drive* reHDD::getSelectedDrive()
 {
-    mxDrives.lock();
-    if (u16SelectedEntry < listDrives.size())
-    {
-        list<Drive>::iterator it = listDrives.begin();
-        advance(it, u16SelectedEntry);
-        it->u16DriveIndex = u16SelectedEntry;
-        mxDrives.unlock();
-        return &(*it);
-    }
-    else
-    {
-        Logger::logThis()->warning("selected drive not present");
-        mxDrives.unlock();
-        return nullptr;
-    }
-}
-
-void reHDD::ThreadScanDevices()
-{
-    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::TaskState::SHRED_ACTIVE)
-            {
-                it->checkFrozenDrive();
-            }
-        }
-        mxDrives.unlock();
-        sleep(13); // sleep 13 sec
-    }
-}
-
-void reHDD::ThreadUserInput()
-{
-    while (true)
-    {
-        Drive *tmpSelectedDrive = getSelectedDrive();
-
-        // cout << TUI::readUserInput() << endl;
-        switch (TUI::readUserInput())
-        {
-        case TUI::UserInput::DownKey:
-            // cout << "Down" << endl;
-            handleArrowKey(TUI::UserInput::DownKey);
-            ui->updateTUI(&listDrives, u16SelectedEntry);
-            break;
-        case TUI::UserInput::UpKey:
-            // cout << "Up" << endl;
-            handleArrowKey(TUI::UserInput::UpKey);
-            ui->updateTUI(&listDrives, u16SelectedEntry);
-            break;
-        case TUI::UserInput::Undefined:
-            // cout << "Undefined" << endl;
-            break;
-        case TUI::UserInput::Abort:
-            // cout << "Abort" << endl;
-            handleAbort();
-            ui->updateTUI(&listDrives, u16SelectedEntry);
-            break;
-        case TUI::UserInput::Delete:
-            // cout << "Delete" << endl;
-
-            if (tmpSelectedDrive != nullptr)
-            {
-                if (tmpSelectedDrive->state == Drive::TaskState::NONE)
-                {
-                    tmpSelectedDrive->state = Drive::TaskState::DELETE_SELECTED;
-                }
-            }
-
-            ui->updateTUI(&listDrives, u16SelectedEntry);
-            break;
-        case TUI::UserInput::Shred:
-            // cout << "Shred" << endl;
-            if (tmpSelectedDrive != nullptr)
-            {
-                if (tmpSelectedDrive->state == Drive::TaskState::NONE)
-                {
-                    tmpSelectedDrive->state = Drive::TaskState::SHRED_SELECTED;
-                }
-            }
-            ui->updateTUI(&listDrives, u16SelectedEntry);
-            break;
-        case TUI::UserInput::ShredAll:
-            // cout << "ShredAll" << endl;
-            startShredAllDrives(&listDrives);
-            ui->updateTUI(&listDrives, u16SelectedEntry);
-            break;
-        case TUI::UserInput::Enter:
-            // cout << "Enter" << endl;
-            handleEnter();
-            ui->updateTUI(&listDrives, u16SelectedEntry);
-            break;
-        case TUI::UserInput::ESC:
-            // cout << "ESC" << endl;
-            handleESC();
-            ui->updateTUI(&listDrives, u16SelectedEntry);
-            break;
-        case TUI::UserInput::Terminate:
-            // cout << "Terminate" << endl;
-            stopShredAllDrives(&listDrives);
-            ui->terminateTUI();
-            sleep(5);     // sleep 5 sec
-            std::exit(1); // Terminates main, doesn't wait for threads
-            break;
-        case TUI::UserInput::Print:
-            // cout << "Print" << endl;
-            if (tmpSelectedDrive != nullptr)
-            {
-                printDrive(tmpSelectedDrive);
-            }
-            ui->updateTUI(&listDrives, u16SelectedEntry);
-            break;
-        case TUI::UserInput::PrintAll:
-            // cout << "PrintAll" << endl;
-            printAllDrives(&listDrives);
-            ui->updateTUI(&listDrives, u16SelectedEntry);
-            break;
-        default:
-            break;
-        }
-    }
-}
-
-/**
- * \brief   print all shredded drives
- * \param	pointer of list <Drive>* plistDrives
- * \return  void
- */
-void reHDD::printAllDrives(list<Drive> *plistDrives)
-{
-    list<Drive>::iterator it;
-    mxDrives.lock();
-    for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-    {
-        Drive *pTmpDrive = iterator_to_pointer<Drive, std::list<Drive>::iterator>(it);
-        printDrive(pTmpDrive);
-    }
-    mxDrives.unlock();
-}
-
-/**
- * \brief   print a shredded drives
- * \param	pointer of a drive
- * \return  void
- */
-void reHDD::printDrive(Drive *const pDrive)
-{
-    if (pDrive->bWasShredded)
-    {
-#ifdef ZERO_CHECK
-        if (pDrive->bWasChecked && (pDrive->u32DriveChecksumAfterShredding != 0U))
-        {
-            return; // Drive was shredded&checked but checksum failed, don't print label
-        }
-#endif
-        Logger::logThis()->info("User print for: " + pDrive->getModelName() + "-" + pDrive->getSerial());
-        Printer::getPrinter()->print(pDrive);
-    }
-}
-
-void reHDD::ThreadShred(Drive *const pDrive)
-{
-    if (pDrive != nullptr)
-    {
-        pDrive->setActionStartTimestamp();                         // save timestamp at start of shredding
-        Shred *pShredInstance = new Shred();                       // create new shred task
-        pShredInstance->shredDrive(pDrive, &fdShredInformPipe[1]); // start new shred task
-        delete pShredInstance;                                     // delete shred task
-        ui->updateTUI(&listDrives, u16SelectedEntry);
-    }
-}
-
-void reHDD::ThreadDelete(Drive *const pDrive)
-{
-    if (pDrive != nullptr)
-    {
-        pDrive->state = Drive::TaskState::DELETE_ACTIVE;
-        pDrive->setActionStartTimestamp();      // save timestamp at start of deleting
-        Delete::deleteDrive(pDrive);            // blocking, no thread
-        pDrive->state = Drive::TaskState::NONE; // delete finished
-        pDrive->bWasDeleted = true;
-        Logger::logThis()->info("Finished delete for: " + pDrive->getModelName() + "-" + pDrive->getSerial());
-        ui->updateTUI(&listDrives, u16SelectedEntry);
-    }
-}
-
-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::TaskState::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(std::list<Drive> *plistDrives)
-{
-    FILE *fp = popen("lsblk -d -n -o NAME,TRAN", "r");
-    if (!fp)
-    {
-        Logger::logThis()->error("Unable to execute lsblk to scan drives");
-        exit(EXIT_FAILURE);
-    }
-
-    char line[256];
-    while (fgets(line, sizeof(line), fp))
-    {
-        std::string devName, transport;
-        std::istringstream iss(line);
-        iss >> devName >> transport;
-
-        if (devName.empty())
-            continue;
-
-        Drive tmpDrive("/dev/" + devName);
-        tmpDrive.state = Drive::TaskState::NONE;
-        tmpDrive.bIsOffline = false;
-
-        // Set connection type
-        if (transport == "sata")
-            tmpDrive.connectionType = Drive::ConnectionType::SATA;
-        else if (transport == "usb")
-            tmpDrive.connectionType = Drive::ConnectionType::USB;
-        else if (transport == "nvme")
-            tmpDrive.connectionType = Drive::ConnectionType::NVME;
-        else
-            tmpDrive.connectionType = Drive::ConnectionType::UNKNOWN;
-
-        plistDrives->push_back(tmpDrive);
-
-        Logger::logThis()->info(
-            "Drive found: " + tmpDrive.getPath() +
-            " (type: " +
-            (tmpDrive.connectionType == Drive::ConnectionType::USB ? "USB" : tmpDrive.connectionType == Drive::ConnectionType::SATA ? "SATA"
-                                                                         : tmpDrive.connectionType == Drive::ConnectionType::NVME   ? "NVME"
-                                                                                                                                    : "UNKNOWN") +
-            ")");
-    }
-
-    pclose(fp);
-}
-
-/**
- * \brief   filter out drives that are listed in "ignoreDrives.conf", loop devices, and optical drives
- * \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 = plistDrives->begin();
-        while (it != plistDrives->end())
-        {
-            string driveName = it->getPath();
-            // Remove /dev/ prefix
-            if (driveName.find("/dev/") == 0)
-            {
-                driveName = driveName.substr(5); // Skip "/dev/"
-            }
-
-            if (systemDrivePath.find(driveName) != std::string::npos) // compare found system drive and current drive
-            {
-                // system drive found --> ignore this drive
-#ifdef LOG_LEVEL_HIGH
-                Logger::logThis()->info("system drive found --> ignore this drive: " + it->getPath());
-#endif
-                it = plistDrives->erase(it);
-            }
-            else
-            {
-                ++it;
-            }
-        }
-    }
-
-    // Filter out loop devices (loop0, loop1, etc.)
-    list<Drive>::iterator it = plistDrives->begin();
-    while (it != plistDrives->end())
-    {
-        string driveName = it->getPath();
-        if (driveName.find("/dev/") == 0)
-        {
-            driveName = driveName.substr(5);
-        }
-
-        if (driveName.find("loop") == 0)
-        {
-#ifdef LOG_LEVEL_HIGH
-            Logger::logThis()->info("loop device found --> ignore this drive: " + it->getPath());
-#endif
-            it = plistDrives->erase(it);
-        }
-        else
-        {
-            ++it;
-        }
-    }
-
-    // Filter out optical drives (sr0, sr1, cdrom, dvd, etc.)
-    it = plistDrives->begin();
-    while (it != plistDrives->end())
-    {
-        string driveName = it->getPath();
-        if (driveName.find("/dev/") == 0)
-        {
-            driveName = driveName.substr(5);
-        }
-
-        if (driveName.find("sr") == 0 ||
-            driveName.find("cdrom") == 0 ||
-            driveName.find("dvd") == 0 ||
-            driveName.find("cdrw") == 0)
-        {
-#ifdef LOG_LEVEL_HIGH
-            Logger::logThis()->info("optical drive found --> ignore this drive: " + it->getPath());
-#endif
-            it = plistDrives->erase(it);
-        }
-        else
-        {
-            ++it;
-        }
-    }
-
-    // Read ignored drives from config file
-    list<tuple<string>> vtlIgnoredDevices;
-    ifstream input("ignoreDrives.conf");
-
-    for (string sLine; getline(input, sLine);)
-    {
-        // Skip empty lines and comments
-        if (!sLine.empty() && sLine[0] != '#')
-        {
-            vtlIgnoredDevices.emplace_back(sLine);
-        }
-    }
-
-    // Loop through found entries in ignore file
-    for (auto row : vtlIgnoredDevices)
-    {
-        it = plistDrives->begin();
-        while (it != plistDrives->end())
-        {
-            string sUUID;
-            char *cLine = NULL;
-            size_t len = 0;
-            string sCMD = "blkid ";
-            sCMD.append(it->getPath());
-
-            FILE *outputfileBlkid = popen(sCMD.c_str(), "r");
-            if (outputfileBlkid == NULL)
-            {
-                Logger::logThis()->error("Failed to execute blkid for: " + it->getPath());
-                ++it;
-                continue;
+    return pDummyDrive;
 }
 
-            while ((getline(&cLine, &len, outputfileBlkid)) != -1)
-            {
-                size_t ptuuidPos = string(cLine).find("PTUUID");
-                if (ptuuidPos != string::npos)
+void reHDD::ThreadShred()
 {
-                    string sBlkidOut = string(cLine);
-                    sBlkidOut.erase(0, ptuuidPos + 8);
-                    if (sBlkidOut.length() >= 8)
+    if (getSelectedDrive() != nullptr)
         {
-                        sBlkidOut.erase(8, sBlkidOut.length());
-                    }
-                    sUUID = sBlkidOut;
+            Logger::logThis()->info("Starting Shred Thread");
+            getSelectedDrive()->setActionStartTimestamp(); //save timestamp at start of shredding
+            Shred* pShredTask = new Shred(); //create new shred task
+            pShredTask->shredDrive(getSelectedDrive(), &fdShredInformPipe[1]); //start new shred task
+            delete pShredTask; //delete shred task
         }
 }
-            free(cLine);
-            pclose(outputfileBlkid);
 
-            if (!get<0>(row).compare(sUUID))
-            {
-#ifdef LOG_LEVEL_HIGH
-                Logger::logThis()->info("same uuid found in ignore file --> ignore this drive: " + it->getPath());
-#endif
-                it = plistDrives->erase(it);
-            }
-            else
-            {
-                ++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);
-        }
-    }
-}
-
-/**
- * \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::TaskState::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
-            thread(ThreadShred, pTmpDrive).detach();
-        }
-    }
-    mxDrives.unlock();
-}
-
-/**
- * \brief   stop shred for all drives
- * \param	pointer of list <Drive>* plistDrives
- * \return  void
- */
-void reHDD::stopShredAllDrives(list<Drive> *plistDrives)
-{
-    list<Drive>::iterator it;
-    mxDrives.lock();
-    for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-    {
-
-        if (it->state == Drive::TaskState::SHRED_ACTIVE || it->state == Drive::TaskState::DELETE_ACTIVE)
-        {
-            it->state = Drive::TaskState::NONE;
-            Logger::logThis()->info("Abort-Shred-Signal for: " + it->getModelName() + "-" + it->getSerial());
-            // task for drive is running --> remove selection
-        }
-
-#ifdef LOG_LEVEL_HIGH
-        ostringstream address;
-        address << (void const *)&(*it);
-        Logger::logThis()->info("Started shred (all) for: " + it->getModelName() + "-" + it->getSerial() + " @" + address.str());
-#endif
-    }
-    mxDrives.unlock();
-}
-
-/**
- * \brief   print drives with all information
- * \param	pointer of list <Drive>* plistDrives
- * \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::TaskState::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();
-            auto shredSpeed = pTmpDrive->sShredSpeed.load();
-            time_t u32ShredTimeDelta = (chronoCurrentTimestamp - shredSpeed.chronoShredTimestamp).count();
-            if (u32ShredTimeDelta > METRIC_THRESHOLD)
-            {
-                shredSpeed.u32ShredTimeDelta = u32ShredTimeDelta;
-                shredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();
-                shredSpeed.ulWrittenBytes = shredSpeed.ulSpeedMetricBytesWritten;
-                shredSpeed.ulSpeedMetricBytesWritten = 0U;
-                pTmpDrive->sShredSpeed.store(shredSpeed);
-            }
-        }
-    }
-}
-
-/**
- * \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)
-{
-    uint8_t u8EntrySize = (uint8_t)listDrives.size();
-    switch (userInput)
-    {
-    case TUI::UserInput::DownKey:
-        u16SelectedEntry++;
-        if (u16SelectedEntry >= u8EntrySize)
-        {
-            u16SelectedEntry = 0;
-        }
-        break;
-    case TUI::UserInput::UpKey:
-        if (u16SelectedEntry == 0)
-        {
-            u16SelectedEntry = (u8EntrySize - 1);
-        }
-        else
-        {
-            u16SelectedEntry--;
-        }
-        break;
-    default:
-        u16SelectedEntry = 0;
-        break;
-    }
-
-    // Logger::logThis()->info("ArrowKey - selected drive: " + to_string(u8SelectedEntry));
-}
-
-void reHDD::handleEnter()
-{
-    Drive *tmpSelectedDrive = getSelectedDrive();
-    if (tmpSelectedDrive != nullptr)
-    {
-        if (tmpSelectedDrive->state == Drive::TaskState::SHRED_SELECTED)
-        {
-            Logger::logThis()->info("Started shred/check for: " + tmpSelectedDrive->getModelName() + "-" + tmpSelectedDrive->getSerial());
-            thread(ThreadShred, tmpSelectedDrive).detach();
-        }
-
-        if (tmpSelectedDrive->state == Drive::TaskState::DELETE_SELECTED)
-        {
-            Logger::logThis()->info("Started delete for: " + tmpSelectedDrive->getModelName() + "-" + tmpSelectedDrive->getSerial());
-            thread(ThreadDelete, tmpSelectedDrive).detach();
-        }
-    }
-}
-
-void reHDD::handleESC()
-{
-    Drive *tmpSelectedDrive = getSelectedDrive();
-    if (tmpSelectedDrive != nullptr)
-    {
-        if (tmpSelectedDrive->state == Drive::TaskState::SHRED_SELECTED)
-        {
-            tmpSelectedDrive->state = Drive::TaskState::NONE;
-            // task for drive is selected --> remove selection
-        }
-
-        if (tmpSelectedDrive->state == Drive::TaskState::DELETE_SELECTED)
-        {
-            tmpSelectedDrive->state = Drive::TaskState::NONE;
-            // task for drive is selected --> remove selection
-        }
-    }
-}
-
-void reHDD::handleAbort()
-{
-    Drive *tmpSelectedDrive = getSelectedDrive();
-    if (tmpSelectedDrive != nullptr)
-    {
-        if (tmpSelectedDrive->state == Drive::TaskState::SHRED_ACTIVE || tmpSelectedDrive->state == Drive::TaskState::DELETE_ACTIVE)
-        {
-            tmpSelectedDrive->state = Drive::TaskState::NONE;
-            Logger::logThis()->info("Abort-Shred-Signal for: " + tmpSelectedDrive->getModelName() + "-" + tmpSelectedDrive->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;
-        }
-
-        // Extract drive name from line (removing tree characters)
-        if ((cLine[0U] != '|') && (cLine[0U] != '`'))
-        {
-            systemDrive = currentLine;
-
-            // Find the actual drive name (after tree characters like └─, ├─)
-            size_t lastAlpha = 0;
-            for (size_t i = 0; i < systemDrive.length(); i++)
-            {
-                if (isalpha(systemDrive[i]))
-                {
-                    lastAlpha = i;
-                    break;
-                }
-            }
-
-            systemDrive = systemDrive.substr(lastAlpha);
-        }
-
-        if (currentLine.ends_with(" /boot/efi\n"s))
-        {
-            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);
-
-    // Remove mountpoint (everything after first space)
-    size_t spacePos = systemDrive.find(' ');
-    if (spacePos != std::string::npos)
-    {
-        systemDrive = systemDrive.substr(0, spacePos);
-    }
-
-    // Remove all unwanted characters
-    systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), '\n'), systemDrive.end());
-    systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), '/'), systemDrive.end());
-    systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), '\r'), systemDrive.end());
-
-    return systemDriveFound;
-}

src/shred.cpp

@@ -2,20 +2,10 @@
  * @file    shred.cpp
  * @brief   shred drive
  * @author  hendrik schutter
- * @date    22.08.2022
+ * @date    03.05.2020
  */
 
 #include "../include/reHDD.h"
-using namespace std;
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-#include "../tfnoisegen/tfprng.h"
-#ifdef __cplusplus
-}
-#endif
 
 const static char *randomsrc = (char*) "/dev/urandom";
 
@@ -34,34 +24,28 @@ Shred::~Shred()
  */
 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
-    drive->bWasShredded = false;
-    drive->setTaskPercentage(0.0);
-    drive->u32DriveChecksumAfterShredding = UINT32_MAX;
-    drive->state = Drive::TaskState::SHRED_ACTIVE;
 
 #ifdef DRYRUN
-    for (int i = 0; i <= 100; i++)
+    for(int i = 0; i<=500; i++)
         {
+            if(drive->state != Drive::SHRED_ACTIVE)
+                {
+                    return 0;
+                }
             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
     randomSrcFileDiscr = open(randomsrc, O_RDONLY | O_LARGEFILE);
     if (randomSrcFileDiscr == -1)
         {
-        std::string errorMsg(strerror(errno));
+            std::string errorMsg(strerror(randomSrcFileDiscr));
             Logger::logThis()->error("Shred-Task: Open random source failed! " + errorMsg + " - Drive: " + drive->getSerial());
             perror(randomsrc);
             cleanup();
@@ -72,31 +56,16 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
     driveFileDiscr = open(cpDrivePath, O_RDWR | O_LARGEFILE);
     if (driveFileDiscr == -1)
         {
-        std::string errorMsg(strerror(errno));
+            std::string errorMsg(strerror(driveFileDiscr));
             Logger::logThis()->error("Shred-Task: Open drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
             perror(cpDrivePath);
             cleanup();
             return -1;
         }
 
-    // read key for random generator
-    ssize_t readRet = read(randomSrcFileDiscr, ucKey, sizeof(ucKey));
-    if (readRet <= 0)
-    {
-        std::string errorMsg(strerror(errno));
-        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::ShredSpeed shredSpeed = drive->sShredSpeed.load();
-    shredSpeed.chronoShredTimestamp = std::chrono::system_clock::now(); // set inital timestamp for speed metric
-    shredSpeed.ulSpeedMetricBytesWritten = 0U;                          // uses to calculate speed metric
-    drive->sShredSpeed.store(shredSpeed);
+    drive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();; //set inital timestamp for 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());
@@ -105,21 +74,46 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
     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
+            uint32_t u32ChunkDimensionIndex = 0U;
 
+/*
             if(uiShredIterationCounter == (SHRED_ITERATIONS-1))
                 {
-            // last shred iteration --> overwrite (just the write chunk) bytes with zeros instead with random data
-            memset(caTfngData, 0U, CHUNK_SIZE);
+                    //last shred iteration --> overwrite with zeros instead with random data
+                    memset(caChunk, 0U, CHUNK_DIMENSION*CHUNK_SIZE);
                 }
+                */
 
             while (ulDriveByteCounter < ulDriveByteSize)
                 {
                     int iBytesToShred = 0; //Bytes that will be overwritten in this chunk-iteration
 
-            if (uiShredIterationCounter != (SHRED_ITERATIONS - 1))
+                    if((u32ChunkDimensionIndex == 0U))
                         {
-                // NOT last shred iteration --> generate new random data
-                tfng_prng_genrandom(caTfngData, TFNG_DATA_SIZE);
+                            //read new chunks from random source if needed and this is NOT the last shred iteration
+                            unsigned long ulBytesInChunkBuffer = 0U;
+
+                            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((ulDriveByteSize-ulDriveByteCounter) < CHUNK_SIZE)
@@ -131,38 +125,44 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
                             iBytesToShred = CHUNK_SIZE;
                         }
 
-            int iByteShredded = write(driveFileDiscr, caTfngData, iBytesToShred);
+                    int iByteShredded = write(driveFileDiscr, caChunk[u32ChunkDimensionIndex], iBytesToShred);
 
                     if(iByteShredded <= 0)
                         {
-                std::string errorMsg(strerror(errno));
+                            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;
                         }
 
-            auto shredSpeed = drive->sShredSpeed.load();
-            shredSpeed.ulSpeedMetricBytesWritten += iByteShredded;
-            drive->sShredSpeed.store(shredSpeed);
-
+                    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());
 #endif
-
                     if((d32Percent-d32TmpPercent) >= 0.01)
                         {
                             //set shred percantage
                             drive->setTaskPercentage(d32TmpPercent);
                             d32TmpPercent = d32Percent;
+
+                            //set metrics for calculating shred speed
+                            std::chrono::time_point<std::chrono::system_clock> chronoCurrentTimestamp = std::chrono::system_clock::now();
+                            drive->sShredSpeed.u32ShredTimeDelta = (chronoCurrentTimestamp - drive->sShredSpeed.chronoShredTimestamp).count();
+                            drive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();
+                            drive->sShredSpeed.ulWrittenBytes = ulSpeedMetricBytesWritten;
+                            ulSpeedMetricBytesWritten = 0U;
+
                             //signal process in shreding
                             write(*ipSignalFd, "A",1);
                         }
 
-            if (drive->state != Drive::TaskState::SHRED_ACTIVE)
+                    if(drive->state != Drive::SHRED_ACTIVE)
                         {
                             drive->setTaskPercentage(0);
                             d32Percent = 0.00;
@@ -172,50 +172,37 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
                             cleanup();
                             return -1;
                         }
-            // end one chunk write
-        }
+                }//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
+        } //end one shred iteration
 
-    tfng_prng_seedkey(NULL); // reset random generator
-
-    drive->bWasShredded = true;
-    Logger::logThis()->info("Shred-Task finished - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
-#ifdef ZERO_CHECK
-    drive->state = Drive::TaskState::CHECK_ACTIVE;
-    Logger::logThis()->info("Check-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
-    drive->u32DriveChecksumAfterShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd);
-
-    if (drive->u32DriveChecksumAfterShredding != 0)
+#ifdef ZERO_CHECK_ALERT
+    drive->u32DriveChecksumAferShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd);
+#ifdef LOG_LEVEL_HIGH
+    if (drive->u32DriveChecksumAferShredding != 0)
         {
-        drive->state = Drive::TaskState::CHECK_FAILED;
-        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
         {
-        drive->state = Drive::TaskState::CHECK_SUCCESSFUL;
-        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
-    cleanup();
+#endif
 #endif
 
-    if ((drive->state.load() == Drive::TaskState::SHRED_ACTIVE) || (drive->state.load() == Drive::TaskState::CHECK_SUCCESSFUL) || (drive->state == Drive::TaskState::CHECK_FAILED))
+    cleanup();
+
+    if(drive->state == Drive::SHRED_ACTIVE)
         {
-        if (drive->state != Drive::TaskState::CHECK_FAILED)
-        {
-            Printer::getPrinter()->print(drive);
-        }
-        drive->state = Drive::TaskState::NONE;
+            drive->bWasShredded = true;
+            drive->state= Drive::NONE;
             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;
 }
@@ -229,11 +216,9 @@ double Shred::calcProgress()
 {
     unsigned int uiMaxShredIteration = SHRED_ITERATIONS;
 
-#ifdef ZERO_CHECK
+#ifdef ZERO_CHECK_ALERT
     uiMaxShredIteration++; //increment because we will check after SHRED_ITERATIONS the drive for non-zero bytes
 #endif
-    if (this->ulDriveByteSize == 0)
-        return 0.0;
     return (double) (((double) ulDriveByteOverallCount) / ((double)this->ulDriveByteSize*uiMaxShredIteration))*100.0f;
 }
 
@@ -242,7 +227,6 @@ int Shred::iRewindDrive(fileDescriptor file)
     if(0 != lseek(file, 0L, SEEK_SET))
         {
             perror("unable to rewind drive");
-        Logger::logThis()->info("Unable to rewind drive! - fileDescriptor: " + to_string(file));
             return -1;
         }
     else
@@ -251,26 +235,19 @@ int Shred::iRewindDrive(fileDescriptor file)
         }
 }
 
-long Shred::getDriveSizeInBytes(fileDescriptor file)
+unsigned long Shred::getDriveSizeInBytes(fileDescriptor file)
 {
-    long liDriveSizeTmp = lseek(file, 0L, SEEK_END);
-
-    if (liDriveSizeTmp == -1)
-    {
-        perror("unable to get drive size");
-        Logger::logThis()->info("Unable to get drive size! - fileDescriptor: " + to_string(file));
-        return 0L;
-    }
+    unsigned long ulDriveSizeTmp = lseek(file, 0L, SEEK_END);
 
     if(0 != iRewindDrive(file))
         {
-        liDriveSizeTmp = 0L;
+            ulDriveSizeTmp = 0U;
         }
 
 #ifdef DEMO_DRIVE_SIZE
-    liDriveSizeTmp = DEMO_DRIVE_SIZE;
+    ulDriveSizeTmp = DEMO_DRIVE_SIZE;
 #endif
-    return liDriveSizeTmp;
+    return ulDriveSizeTmp;
 }
 
 unsigned int Shred::uiCalcChecksum(fileDescriptor file,Drive* drive, int* ipSignalFd)
@@ -288,33 +265,24 @@ unsigned int Shred::uiCalcChecksum(fileDescriptor file, Drive *drive, int *ipSig
                 {
                     iBytesToCheck = CHUNK_SIZE;
                 }
-        int iReadBytes = read(file, caReadBuffer, iBytesToCheck);
+            int iReadBytes = read(file, caChunk, iBytesToCheck);
             for (int iReadBytesCounter = 0U; iReadBytesCounter < iReadBytes; iReadBytesCounter++)
                 {
-            uiChecksum += caReadBuffer[iReadBytesCounter];
+                    uiChecksum += caChunk[0][iReadBytesCounter];
                 }
             ulDriveByteCounter += iReadBytes;
             ulDriveByteOverallCount += iReadBytes;
             d32Percent = this->calcProgress();
-        auto shredSpeed = drive->sShredSpeed.load();
-        shredSpeed.ulSpeedMetricBytesWritten += iReadBytes;
-        drive->sShredSpeed.store(shredSpeed);
-
 #ifdef LOG_LEVEL_HIGH
             Logger::logThis()->info("Shred-Task (Checksum): ByteCount: " + to_string(ulDriveByteCounter) + " - progress: " + to_string(d32Percent) + " - Drive: " + drive->getSerial());
 #endif
-
-        if (((d32Percent - d32TmpPercent) >= 0.01) || (d32Percent == 100.0))
+            if((d32Percent-d32TmpPercent) >= 0.9)
                 {
                     drive->setTaskPercentage(d32TmpPercent);
                     d32TmpPercent = d32Percent;
-#ifdef LOG_LEVEL_HIGH
-            Logger::logThis()->info("send progress signal to main loop (check)");
-#endif
                     write(*ipSignalFd, "A",1);
                 }
         }
-    drive->bWasChecked = true;
     return uiChecksum;
 }
 

src/smart.cpp

@@ -6,7 +6,14 @@
  */
 
 #include "../include/reHDD.h"
-using namespace std;
+
+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
@@ -15,297 +22,157 @@ using namespace std;
  */
 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");
-        sCMD.append(sSmartctlCommand);
+    string sCMD = ("smartctl --json -a ");
     sCMD.append(drive->getPath());
     const char* cpComand = sCMD.c_str();
 
-        // Logger::logThis()->info(cpComand);
-
     FILE* outputfileSmart = popen(cpComand, "r");
-        size_t len = 0U;    // length of found line
-        char *cLine = NULL; // found line
-        uint8_t status = 255U;
 
     while ((getline(&cLine, &len, outputfileSmart)) != -1)
         {
             string sLine = string(cLine);
 
-            SMART::parseExitStatus(sLine, status);
-            SMART::parseModelFamily(sLine, modelFamily);
-            SMART::parseModelName(sLine, modelName);
-            SMART::parseSerial(sLine, serial);
-            SMART::parseCapacity(sLine, capacity);
-            SMART::parseErrorCount(sLine, errorCount);
-            SMART::parsePowerOnHours(sLine, powerOnHours);
-            SMART::parsePowerCycles(sLine, powerCycles);
-            SMART::parseTemperature(sLine, temperature);
+            SMART::parseModelFamily(sLine);
+            SMART::parseModelName(sLine);
+            SMART::parseSerial(sLine);
+            SMART::parseCapacity(sLine);
+            SMART::parseErrorCount(sLine);
+            SMART::parsePowerOnHours(sLine);
+            SMART::parsePowerCycle(sLine);
         }
-
-        free(cLine);
     pclose(outputfileSmart);
-
-        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
+    drive->setDriveSMARTData(modelFamily, modelName, serial, capacity, errorCount, powerOnHours, powerCycle); //wirte data in drive
 }
 
 /**
- * \brief parse ExitStatus
+ * \brief   parse ModelFamiliy
  * \param	string output line of smartctl
- * \param uint8_t parsed status
- * \return bool if parsing was possible
+ * \return  void
  */
-bool SMART::parseExitStatus(string sLine, uint8_t &status)
-{
-    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)
+void SMART::parseModelFamily(string sLine)
 {
     string search("\"model_family\": ");
     size_t found = sLine.find(search);
     if (found!=string::npos)
         {
-        sLine.erase(0U, sLine.find(": ") + 3U);
-        if (sLine.length() >= 3U)
-        {
-            sLine.erase(sLine.length() - 3U, 3U);
-        }
+            sLine.erase(0, sLine.find(": ") + 3);
+            sLine.erase(sLine.length()-3, 3);
             modelFamily = sLine;
-        return true;
-    }
-    else
-    {
-        return false;
         }
 }
 
 /**
  * \brief   parse ModelName
  * \param	string output line of smartctl
- * \param string parsed model name
- * \return bool if parsing was possible
+ * \return  void
  */
-bool SMART::parseModelName(string sLine, string &modelName)
+void SMART::parseModelName(string sLine)
 {
     string search("\"model_name\": ");
     size_t found = sLine.find(search);
     if (found!=string::npos)
         {
-        sLine.erase(0U, sLine.find(": ") + 3U);
-        if (sLine.length() >= 3U)
-        {
-            sLine.erase(sLine.length() - 3U, 3U);
-        }
+            sLine.erase(0, sLine.find(": ") + 3);
+            sLine.erase(sLine.length()-3, 3);
             modelName = sLine;
-        return true;
-    }
-    else
-    {
-        return false;
         }
 }
 
 /**
  * \brief   parse Serial
  * \param	string output line of smartctl
- * \param string parsed serial
- * \return bool if parsing was possible
+ * \return  void
  */
-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)
         {
             sLine.erase(0, sLine.find(": ") + 3);
-        if (sLine.length() >= 3U)
-        {
-            sLine.erase(sLine.length() - 3U, 3U);
-        }
+            sLine.erase(sLine.length()-3, 3);
             serial = sLine;
-        return true;
-    }
-    else
-    {
-        return false;
         }
 }
 
 /**
  * \brief   parse Capacity
  * \param	string output line of smartctl
- *  \param string parsed capacity
- * \return bool if parsing was possible
+ * \return  void
  */
-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)
         {
             sLine.erase(0, sLine.find(": ") + 2);
-        if (sLine.length() >= 1U)
-        {
-            sLine.erase(sLine.length() - 1U, 1U);
-        }
+            sLine.erase(sLine.length()-1, 1);
             capacity = stol(sLine);
-        return true;
-    }
-    else
-    {
-        return false;
         }
 }
 
 /**
  * \brief   parse ErrorCount
  * \param	string output line of smartctl
- * \param uint32_t parsed error count
- * \return bool if parsing was possible
+ * \return  void
  */
-bool SMART::parseErrorCount(string sLine, uint32_t &errorCount)
+void SMART::parseErrorCount(string sLine)
 {
     string search("\"error_count_total\": ");
     size_t found = sLine.find(search);
     if (found!=string::npos)
         {
-        sLine.erase(0U, sLine.find(": ") + 2U);
-        if (sLine.length() >= 2U)
-        {
-            sLine.erase(sLine.length() - 2U, 2U);
-        }
+            sLine.erase(0, sLine.find(": ")+2);
+            sLine.erase(sLine.length()-2, 2);
             errorCount = stol(sLine);
-        return true;
-    }
-    else
-    {
-        return false;
         }
 }
 
 /**
  * \brief   parse PowerOnHours
- * \param string output line of smartctl\
- * \param uint32_t parsed power on hours
- * \return bool if parsing was possible
+ * \param	string output line of smartctl
+ * \return  void
  */
-bool SMART::parsePowerOnHours(string sLine, uint32_t &powerOnHours)
+void SMART::parsePowerOnHours(string sLine)
 {
     string search("\"hours\": ");
     size_t found = sLine.find(search);
     if (found!=string::npos)
         {
-        sLine.erase(0U, sLine.find(": ") + 2U);
-        if (sLine.length() >= 1U)
-        {
-            sLine.erase(sLine.length() - 1U, 1U);
-        }
+            sLine.erase(0, sLine.find(": ") + 2);
+            sLine.erase(sLine.length()-1, 1);
             powerOnHours = stol(sLine);
-        return true;
-    }
-    else
-    {
-        return false;
+
         }
 }
 
 /**
  * \brief   parse PowerCycle
  * \param	string output line of smartctl
- * \param uint32_t parsed power cycles
- * \return bool if parsing was possible
+ * \return  void
  */
-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)
         {
             sLine.erase(0, sLine.find(": ") + 2);
-        if (sLine.length() >= 2U)
-        {
-            sLine.erase(sLine.length() - 2U, 2U);
-        }
-        powerCycles = stol(sLine);
-        return true;
-    }
-    else
-    {
-        return false;
+            sLine.erase(sLine.length()-2, 2);
+            powerCycle = stol(sLine);
+
         }
 }
 
-/**
- * \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);
-        if (sLine.length() >= 1U)
-        {
-            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

@@ -6,7 +6,6 @@
  */
 
 #include "../include/reHDD.h"
-using namespace std;
 
 static std::mutex mxUIrefresh;
 
@@ -42,33 +41,17 @@ void TUI::initTUI()
     init_pair(COLOR_AREA_STDSCR,COLOR_WHITE, COLOR_BLUE);
     wbkgd(stdscr, COLOR_PAIR(COLOR_AREA_STDSCR));
 
-    init_pair(COLOR_AREA_ENTRY_EVEN, COLOR_BLACK, COLOR_WHITE);
-    init_pair(COLOR_AREA_ENTRY_ODD, COLOR_BLUE, COLOR_WHITE);
-
-#ifdef DRYRUN
-    init_pair(COLOR_AREA_ENTRY_SELECTED, COLOR_WHITE, COLOR_GREEN);
-#else
-    init_pair(COLOR_AREA_ENTRY_SELECTED, COLOR_WHITE, COLOR_RED);
-#endif
-
+    init_pair(COLOR_AREA_ENTRY, COLOR_BLACK, COLOR_WHITE);
+    init_pair(COLOR_AREA_ENTRY_SELECTED, COLOR_BLACK, COLOR_RED);
     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)
 {
-    if (isendwin())
-    {
-        return;
-    }
-
     mxUIrefresh.lock();
     uint16_t u16StdscrX, u16StdscrY;
     getmaxyx(stdscr, u16StdscrY, u16StdscrX);
@@ -78,12 +61,10 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
 
     refresh();
 
-    // overview window is 3/7 of the x-size
-    overview = createOverViewWindow((int)(u16StdscrX * (float)(3.0 / 7.0)), (u16StdscrY - 1));
+    overview=createOverViewWindow((int)(u16StdscrX/3), (u16StdscrY-3));
     wrefresh(overview);
 
-    // system stat window is 2/7 of the x-size
-    systemview = createSystemStats(((int)(u16StdscrX * (float)(2.0 / 7.0))) - 6, 12, (int)(u16StdscrX * (float)(5.0 / 7.0) + 4), (u16StdscrY - 13));
+    systemview=createSystemStats((int)(u16StdscrX/3), 10, u16StdscrX-(int)(u16StdscrX/3)-2, (u16StdscrY-11 ));
     wrefresh(systemview);
 
     delwin(detailview);
@@ -93,15 +74,11 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
     for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
         {
             string sModelFamily = it->getModelFamily();
-        string sSerial = "SN: " + it->getSerial();
+            string sModelName = it->getModelName();
             string sCapacity = it->sCapacityToText();
             string sState = " ";
             string sSpeed = " ";
             string sTime = " ";
-        string sTemp = it->sTemperatureToText();
-        string sConnection = (it->connectionType == Drive::ConnectionType::USB ? "USB" : it->connectionType == Drive::ConnectionType::SATA ? "SATA"
-                                                                                     : it->connectionType == Drive::ConnectionType::NVME   ? "NVME"
-                                                                                                                                           : "");
 
             bool bSelectedEntry = false;
 
@@ -110,81 +87,57 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
                     bSelectedEntry = true; //mark this drive in entries list
                     displaySelectedDrive(*it, u16StdscrX, u16StdscrY);
 
-            if ((it->getPowerOnHours() >= WORSE_HOURS) || (it->getPowerCycles() >= WORSE_POWERUP) || (it->getErrorCount() > 0) || (it->getTemperature() >= WORSE_TEMPERATURE))
+                    if((it->getPowerOnHours() >= WORSE_HOURS) || (it->getPowerCycles() >= WORSE_POWERUP) || (it->getErrorCount() > 0))
                         {
                             // 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());
+                            smartWarning=createSmartWarning(50, 10, ((u16StdscrX)-(int)(u16StdscrX/2)+35),(int)(u16StdscrY/2)-5, it->getPath(), it->getPowerOnHours(), it->getPowerCycles(), it->getErrorCount());
                             wrefresh(smartWarning);
                         }
                 }
 
             stringstream stream;
 
+
             switch (it->state)
                 {
-        case Drive::TaskState::SHRED_ACTIVE:
-        {
+                case Drive::SHRED_ACTIVE:
+
                     stream << fixed << setprecision(3) << (it->getTaskPercentage());
                     sState = "Shredding: " + stream.str() + "%";
 
                     it->calculateTaskDuration();
                     sTime = this->formatTimeDuration(it->getTaskDuration());
-            auto shredSpeed = it->sShredSpeed.load();
-            sSpeed = this->formatSpeed(shredSpeed.u32ShredTimeDelta, shredSpeed.ulWrittenBytes);
+                    sSpeed = this->formatSpeed(it->sShredSpeed.u32ShredTimeDelta, it->sShredSpeed.ulWrittenBytes);
                     break;
-        }
-        case Drive::TaskState::CHECK_ACTIVE:
-        {
-            stream << fixed << setprecision(3) << (it->getTaskPercentage());
-            sState = "Checking: " + stream.str() + "%";
-            it->calculateTaskDuration();
-            sTime = this->formatTimeDuration(it->getTaskDuration());
-            auto shredSpeed = it->sShredSpeed.load();
-            sSpeed = this->formatSpeed(shredSpeed.u32ShredTimeDelta, shredSpeed.ulWrittenBytes);
-            break;
-        }
-        case Drive::TaskState::DELETE_ACTIVE:
-        {
-
+                case Drive::DELETE_ACTIVE:
                     sState = "Deleting ...";
                     it->calculateTaskDuration();
                     sTime = this->formatTimeDuration(it->getTaskDuration());
                     break;
-        }
-        case Drive::TaskState::NONE:
-        case Drive::TaskState::SHRED_SELECTED:
-        case Drive::TaskState::DELETE_SELECTED:
-        case Drive::TaskState::CHECK_SUCCESSFUL:
-        {
-            if (it->bWasDeleted)
+
+                case Drive::NONE:
+                case Drive::SHRED_SELECTED:
+                case Drive::DELETE_SELECTED:
+                    if (it->bWasDeleteted)
                         {
                             sState = "DELETED"; //mark drive as deleted previously
                         }
                     if (it->bWasShredded)
                         {
-                if (it->bWasChecked)
-                {
-                    // drive was also checked after shredding
-                    sState = "SHREDDED & CHECKED"; // mark drive as shredded previously and optional checked
-                }
-                else
-                {
-                    // shredded and not checked yet
-                    sState = "SHREDDED"; // mark drive as shredded previously
-                }
+                            sState = "SHREDDED"; //mark drive as shreded previously, overwrite if deleted
                             sTime = this->formatTimeDuration(it->getTaskDuration());
                         }
 
-#ifdef ZERO_CHECK
-            if (bSelectedEntry && it->bWasChecked && (it->u32DriveChecksumAfterShredding != 0U))
+#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->u32DriveChecksumAfterShredding);
+                            dialog=createZeroChecksumWarning(70, 16, ((u16StdscrX)-(int)(u16StdscrX/2)-20),(int)(u16StdscrY/2)-8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial(), it->u32DriveChecksumAferShredding);
                             wrefresh(dialog);
                         }
 #endif
+
                     break;
-        }
-        case Drive::TaskState::FROZEN:
+                case Drive::FROZEN:
                     stream << fixed << setprecision(3) << (it->getTaskPercentage());
 #ifdef FROZEN_ALERT
                     if(bSelectedEntry)
@@ -199,9 +152,7 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
                     break;
                 }
 
-        uint16_t u16StartOffsetY = (2 * (u8Index));
-
-        WINDOW *tmp = createEntryWindow((int)(u16StdscrX * (float)(3.0 / 7.0) - 2), 2, 3, u16StartOffsetY + 2, (distance(plistDrives->begin(), it) + 1), sModelFamily, sSerial, sCapacity, sState, sTime, sSpeed, sTemp, sConnection, bSelectedEntry);
+            WINDOW * tmp = createEntryWindow( ((int)(u16StdscrX/3) - 2), 5, 3, (5* (u8Index) )+3, sModelFamily, sModelName, sCapacity, sState, sTime, sSpeed, bSelectedEntry);
             wrefresh(tmp);
             u8Index++;
         }//end loop though drives
@@ -217,11 +168,11 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
             menustate.bDelete = false;
             menustate.bShred = false;
 
-        detailview = overwriteDetailViewWindow((u16StdscrX) - ((int)(u16StdscrX * (float)(3.0 / 7.0))) - 7, (u16StdscrY - 15), (int)(u16StdscrX * (float)(3.0 / 7.0) + 5));
-        wrefresh(detailview);
-
-        menuview = createMenuView(((int)(u16StdscrX * (float)(2.0 / 7.0))) - 3, 12, (int)(u16StdscrX * (float)(3.0 / 7.0) + 5), (u16StdscrY - 13), menustate);
+            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);
         }
 
     mxUIrefresh.unlock();
@@ -253,18 +204,6 @@ enum TUI::UserInput TUI::readUserInput()
         case 's':
             return TUI::UserInput::Shred;
             break;
-    case 'S':
-        return TUI::UserInput::ShredAll;
-        break;
-    case 'T':
-        return TUI::UserInput::Terminate;
-        break;
-    case 'p':
-        return TUI::UserInput::Print;
-        break;
-    case 'P':
-        return TUI::UserInput::PrintAll;
-        break;
         default:
             return TUI::UserInput::Undefined;
             break;
@@ -272,11 +211,6 @@ enum TUI::UserInput TUI::readUserInput()
     return TUI::UserInput::Undefined;
 }
 
-void TUI::terminateTUI()
-{
-    endwin();
-}
-
 void TUI::centerTitle(WINDOW *pwin, const char * title)
 {
     int x, maxX, stringSize;
@@ -290,13 +224,10 @@ void TUI::centerTitle(WINDOW *pwin, const char *title)
     waddch(pwin, ACS_LTEE);
 }
 
-/*
-left window that contains the drive entries
-*/
 WINDOW* TUI::createOverViewWindow( int iXSize, int iYSize)
 {
     WINDOW *newWindow;
-    newWindow = newwin(iYSize, iXSize, 1, 2);
+    newWindow = newwin(iYSize, iXSize, 2, 2);
 
     wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_OVERVIEW));
     box(newWindow, ACS_VLINE, ACS_HLINE);
@@ -306,10 +237,10 @@ 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);
 
@@ -317,7 +248,7 @@ WINDOW *TUI::createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive &
     centerTitle(newWindow, title.c_str());
 
     string sPath =  "Path:          " +drive.getPath();
-    string sModelFamily = "ModelFamily:   " + drive.getModelFamily();
+    string sModelFamlily = "ModelFamily:   " + drive.getModelFamily();
     string sModelName =  "ModelName:     " + drive.getModelName();
     string sCapacity =  "Capacity:      " + drive.sCapacityToText();
     string sSerial =  "Serial:        " + drive.getSerial();
@@ -328,7 +259,7 @@ WINDOW *TUI::createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive &
     uint16_t u16Line = 2;
 
     mvwaddstr(newWindow,u16Line++, 3, sPath.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sModelFamily.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sModelFamlily.c_str());
     mvwaddstr(newWindow,u16Line++, 3, sModelName.c_str());
     mvwaddstr(newWindow,u16Line++, 3, sCapacity.c_str());
     mvwaddstr(newWindow,u16Line++, 3, sSerial.c_str());
@@ -345,7 +276,7 @@ WINDOW *TUI::createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive &
 WINDOW* TUI::overwriteDetailViewWindow( int iXSize, int iYSize, int iXStart)
 {
     WINDOW *newWindow;
-    newWindow = newwin(iYSize, iXSize, 1, iXStart);
+    newWindow = newwin(iYSize, iXSize, 2, iXStart);
     wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_DETAIL));
     box(newWindow, ACS_VLINE, ACS_HLINE);
 
@@ -354,10 +285,10 @@ WINDOW *TUI::overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart)
 
     string sLine01 =  "reHDD - hard drive refurbishing tool";
     string sLine02 =  "Version: " + string(REHDD_VERSION);
-    string sLine03 = "Free software under the GNU GPL 3.0";
+    string sLine03 =  "Available under GPL 3.0";
     string sLine04 =  "https://git.mosad.xyz/localhorst/reHDD";
     string sLine05 =  "Delete: Wipe format table - this is NOT secure";
-    string sLine06 = "Shred: Overwrite drive " + to_string(SHRED_ITERATIONS) + " iterations - this is secure";
+    string sLine06 =  "Shred: Overwite drive " + to_string(SHRED_ITERATIONS) + " iterations - this is secure";
 
     uint16_t u16Line = 5;
 
@@ -375,7 +306,7 @@ WINDOW *TUI::overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart)
     return newWindow;
 }
 
-WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, string sConnection, bool bSelected)
+WINDOW* TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, string sModelFamily, string sModelName, string sCapacity, string sState, string sTime, string sSpeed, bool bSelected)
 {
     WINDOW *newWindow;
     newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
@@ -383,67 +314,25 @@ WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart,
     if(!bSelected)
         {
             // entry is NOT selected
-        if (iListIndex % 2 == 0)
-        {
-            // even
-            attron(COLOR_PAIR(COLOR_AREA_ENTRY_EVEN));
-            wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY_EVEN));
-        }
-        else
-        {
-            // odd
-            attron(COLOR_PAIR(COLOR_AREA_ENTRY_ODD));
-            wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY_ODD));
-        }
+            attron(COLOR_PAIR(COLOR_AREA_ENTRY));
+            wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY));
         }
     else
         {
             // entry IS selected
-        attron(COLOR_PAIR(COLOR_AREA_ENTRY_SELECTED));
+            attron(COLOR_PAIR(COLOR_AREA_ENTRY));
             wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY_SELECTED));
         }
 
-    // box(newWindow, ACS_VLINE, ACS_HLINE);
+    box(newWindow, ACS_VLINE, ACS_HLINE);
 
-    // index number
-    mvwaddstr(newWindow, 0, 1, to_string(iListIndex).c_str());
+    mvwaddstr(newWindow,1, 1, sModelFamily.c_str());
+    mvwaddstr(newWindow,2, 1, sModelName.c_str());
+    mvwaddstr(newWindow,3, 1, sCapacity.c_str());
 
-    /*
-    70 chars in x-axis
-
-    line:01
-        0:      space
-        1:      index number
-        2:      space
-        3-35:   ModelFamily
-        36:     space
-        37-43:  Capacity
-        44:     space
-        47-49:  Temp
-        57-60:  Connection Type
-
-    line:02
-        0-2:    space
-        3-31:   Serial
-        32:     space
-        33-45:  Speed
-        46:     space
-        47-58:  Time
-        59:     space
-        60-70:  State (but right side aligned)
-    */
-
-    vTruncateText(&sModelFamily, 32);
-    mvwaddstr(newWindow, 0, 3, sModelFamily.c_str());
-    mvwaddstr(newWindow, 0, 37, sCapacity.c_str());
-    mvwaddstr(newWindow, 0, 47, sTemp.c_str());
-    mvwaddstr(newWindow, 0, 57, sConnection.c_str());
-
-    vTruncateText(&sSerial, 28);
-    mvwaddstr(newWindow, 1, 3, sSerial.c_str());
-    mvwaddstr(newWindow, 1, 33, sSpeed.c_str());
-    mvwaddstr(newWindow, 1, 47, sTime.c_str());
-    mvwaddstr(newWindow, 1, iXSize - sState.length() - 2, sState.c_str());
+    mvwaddstr(newWindow,1, iXSize-sSpeed.length()-5, sSpeed.c_str());
+    mvwaddstr(newWindow,2, iXSize-sState.length()-5, sState.c_str());
+    mvwaddstr(newWindow,3, iXSize-sTime.length()-5, sTime.c_str());
 
     return newWindow;
 }
@@ -468,21 +357,15 @@ WINDOW *TUI::createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart)
 
     string sLine01 =  "reHDD - hard drive refurbishing tool";
     string sLine02 =  "Version: " + string(REHDD_VERSION);
-    string sLine03 = "Build time: ";
-    sLine03.append(__DATE__);
-    sLine03.append(" ");
-    sLine03.append(__TIME__);
-    string sLine04 = "Free software under the GNU GPL 3.0";
-    string sLine05 = "https://git.mosad.xyz/localhorst/reHDD";
+    string sLine03 =  "Available under GPL 3.0";
+    string sLine04 =  "https://git.mosad.xyz/localhorst/reHDD";
 
     uint16_t u16Line = 2;
 
     mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine01.c_str());
-    u16Line++;
     mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine02.c_str());
     mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine03.c_str());
     mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLine04.c_str());
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLine05.c_str());
     u16Line++;
     mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), time.c_str());
 
@@ -503,30 +386,22 @@ WINDOW *TUI::createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, st
 
     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());
             u16Line++;
         }
     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());
             u16Line++;
         }
     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());
-        u16Line++;
         }
 
-    string sLineTmp = "Press p for Print (P for all drives)";
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLineTmp.size() / 2), sLineTmp.c_str());
-    u16Line++;
-
-    sLineTmp = "Press T for terminating reHDD";
-    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLineTmp.size() / 2), sLineTmp.c_str());
-
     return newWindow;
 }
 
@@ -596,7 +471,7 @@ WINDOW *TUI::createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int
     string sLine01 = "Please detach this drive and check it manually:";
     string sShredChecksum = "After shredding the checksum was: " + to_string(u32Checksum);
     string sLinePath =  "Path:          " +sPath;
-    string sLineModelFamily = "ModelFamily:   " + sModelFamily;
+    string sLineModelFamlily = "ModelFamily:   " + sModelFamily;
     string sLineModelName =  "ModelName:     " + sModelName;
     string sLineSerial =  "Serial:        " + sSerial;
 
@@ -609,7 +484,7 @@ WINDOW *TUI::createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int
     mvwaddstr(newWindow,u16Line++, 3, sLine01.c_str());
     u16Line++;
     mvwaddstr(newWindow,u16Line++, 3, sLinePath.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sLineModelFamily.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sLineModelFamlily.c_str());
     mvwaddstr(newWindow,u16Line++, 3, sLineModelName.c_str());
     mvwaddstr(newWindow,u16Line++, 3, sLineSerial.c_str());
     u16Line++;
@@ -644,19 +519,9 @@ string TUI::formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes)
     return out.str();
 }
 
-void TUI::vTruncateText(string *psText, uint16_t u16MaxLenght)
-{
-    if (psText->length() > u16MaxLenght)
-    {
-        psText->resize(u16MaxLenght - 3);
-        *psText = *psText + "...";
-    }
-}
-
-void TUI::displaySelectedDrive(Drive &drive, int stdscrX, int stdscrY)
+void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
 {
     struct MenuState menustate;
-    static bool dialogIsActive;
     menustate.bAbort = false;
     menustate.bConfirmDelete = false;
     menustate.bConfirmShred =  false;
@@ -666,62 +531,52 @@ void TUI::displaySelectedDrive(Drive &drive, int stdscrX, int stdscrY)
     // set menustate based on drive state
     switch (drive.state)
         {
-    case Drive::TaskState::NONE: // no task running or selected for this drive
+        case Drive::NONE: //no task running or selected for this drive
             menustate.bShred = true;
             menustate.bDelete = true;
             break;
-    case Drive::TaskState::DELETE_ACTIVE: // delete task running for this drive
+        case Drive::DELETE_ACTIVE : //delete task running for this drive
             menustate.bAbort = true;
             break;
 
-    case Drive::TaskState::SHRED_ACTIVE: // shred task running for this drive
+        case Drive::SHRED_ACTIVE : //shred task running for this drive
             menustate.bAbort = true;
             break;
 
-    case Drive::TaskState::CHECK_ACTIVE: // check task running for this drive
-        menustate.bAbort = true;
-        break;
-
-    case Drive::TaskState::DELETE_SELECTED: // delete task selected for this drive
+        case Drive::DELETE_SELECTED : //delete task selected for this drive
             menustate.bConfirmDelete = true;
             break;
 
-    case Drive::TaskState::SHRED_SELECTED: // shred task selected for this drive
+        case Drive::SHRED_SELECTED : //shred task selected for this 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);
+    detailview=createDetailViewWindow(((stdscrX)-(int)(stdscrX/3)-7), (stdscrY-15), (int)(stdscrX/3)+5, drive);
     wrefresh(detailview);
 
-    menuview = createMenuView(((int)(stdscrX * (float)(2.0 / 7.0))) - 3, 12, (int)(stdscrX * (float)(3.0 / 7.0) + 5), (stdscrY - 13), menustate);
+    menuview=createMenuView(((int)(stdscrX/3)-10 ), 10, (int)(stdscrX/3)+5,(stdscrY-11), menustate);
     wrefresh(menuview);
 
     if(menustate.bConfirmShred == true)
         {
             dialog=createDialog(40, 10, ((stdscrX)-(int)(stdscrX/3)-7)-(int)((stdscrX/3)+5)/2,(int)(stdscrY/2)-5, "Confirm SHRED", "Press ENTER for SHRED", "Press ESC for cancel");
             wrefresh(dialog);
-        dialogIsActive = true;
         }
     else if(menustate.bConfirmDelete == true)
         {
             dialog=createDialog(40, 10, ((stdscrX)-(int)(stdscrX/3)-7)-(int)((stdscrX/3)+5)/2,(int)(stdscrY/2)-5, "Confirm DELETE", "Press ENTER for DELETE", "Press ESC for cancel");
             wrefresh(dialog);
-        dialogIsActive = true;
         }
     else
-    {
-        if (dialogIsActive)
         {
             delwin(dialog);
-            dialogIsActive = false;
-        }
         }
 }
 
-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);
@@ -754,14 +609,7 @@ WINDOW *TUI::createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart
 
     if(u32ErrorCount > 0)
         {
-        string sLineTmp = "S.M.A.R.T. errors detected: " + to_string(u32ErrorCount);
-        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";
+            string sLineTmp = "S.M.A.R.T. erros detected: " + to_string(u32ErrorCount);
             mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLine01.size()/2), sLineTmp.c_str());
         }
     return newWindow;