comments for better understanding

display shred speed
2022-08-22 09:47:06 +02:00 · 2022-06-30 09:38:11 +02:00
46 changed files with 2930 additions and 2121 deletions
--- a/.gitignore
+++ b/.gitignore
@ -41,10 +41,7 @@

 reHDD

-*.log
-*.ods
-*.txt
+reHDD.log

-.vscode/

 ignoreDrives.conf
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +0,0 @@
-[submodule "tfnoisegen"]
-	path = tfnoisegen
-	url = https://git.mosad.xyz/localhorst/tfnoisegen.git
--- a/README.md
+++ b/README.md
@ -1,68 +1,80 @@
 # 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 ##
-[2.5GB image v1.0.0](https://schuttercloud.com/s/ggxGH9sA326aRfK)   (`wget` is your friend)
-
-Use [Etcher](https://www.balena.io/etcher/#download) or `dd` to create an bootable USB drive .

 ## Screenshot 
-![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/95828afcc2e417b9cb64a4add98ae9c3c7628e84/doc/screenshot.png "Screenshot")

 ## Debian Build Notes

-* `apt-get install ncurses-dev git make g++`
-* `git submodule init`
-* `git submodule update`
-* `make release`
-
-## Enable Label Printer ##
-
-Just install [reHDDPrinter](https://git.mosad.xyz/localhorst/reHDDPrinter).
-No further settings needed.
+* apt-get install ncurses-dev git make g++ 
+* clone repo in /root/
+* make release

 ## Create Standalone with Debian 11

 Instructions how to create a standalone machine that boots directly to reHDD. This is aimed for production use, like several drives a day shredding.
-* 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
-* `apt-get install hwinfo smartmontools curl htop sudo`

-### Installation
+* apt-get install hwinfo smartmontools curl

-clone this repo into /root/
+### Start reHDD after boot without login (as a tty shell)
+
+mkdir /lib/systemd/system/getty@tty1.service.d/
+
+nano /lib/systemd/system/getty@tty1.service.d/override.conf

 ```
-git submodule init
-git submodule update
+[Service]
+WorkingDirectory=/root/reHDD
+ExecStart=
+ExecStart=-/root/reHDD/reHDD
+StandardInput=tty
+StandardOutput=tty
+Restart=always
+RestartSec=1
+UtmpIdentifier=tty1
+TTYPath=/dev/tty1
+TTYReset=yes
+TTYVHangup=yes
+TTYVTDisallocate=yes
+SendSIGHUP=yes
+
 ```

-`cd /root/reHDD/`
+systemctl daemon-reload

-`make release`
+nano /etc/systemd/system/reHDDSettings.service 
+```
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/bash /root/reHDDSettings.sh

-`bash scripts/install_reHDD.bash`
+[Install]
+WantedBy=multi-user.target
+```

-If you want to upload the logs, edit `scripts/reHDDLogUploader.bash` with your nextcloud token
+nano /root/reHDDSettings.sh
+```
+#!/bin/bash
+dmesg -n 1 #disable overlay if a drive is attached/detached
+# remove comment for the following to activate log telemetie
+# curl -k -T /root/reHDD/reHDD.log -u "fgggfffgfgfgfg:" -H 'X-Requested-With: XMLHttpRequest' https://schuttercloud.com/public.php/webdav/`echo $(date '+%Y-%m-%d_%H-%M')`_reHDD.log
+rm -f /root/reHDD/reHDD.log
+```
+chmod +x reHDDSettings.sh

-Add your system drive in `/root/reHDD/ignoreDrives.conf` like:
+
+Make sure the binary reHDD is in /root/reHDD/
+
+Add your system drive in /root/reHDD/ignoreDrives.conf like:
 ```e102f49d```
-Get the first 8 Bytes from your UUID via `blkid /dev/sdX`
+Get the first 8 Bytes from your UUID via blkid /dev/sdX

-`reboot`
+systemctl enable reHDDSettings.service

-## Build docs 
-`make docs`
-
-open `doc/html/index.html` in browser
--- a/astyle.sh
+++ b/astyle.sh
@ -0,0 +1,24 @@
+#! /bin/bash
+
+echo starting astyle for $PWD
+
+astyle --style=gnu src/*.cpp
+rm -f src/*.orig
+
+astyle --style=gnu src/shred/*.cpp
+rm -f src/shred/*.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//shred/*.h
+rm -f include//shred/*.orig
+
+astyle --style=gnu include//logger/*.h
+rm -f include//logger/*.orig
+
+echo finished astyle for $PWD
--- a/doc/doxyfile
+++ b/doc/doxyfile
@ -467,7 +467,7 @@ LOOKUP_CACHE_SIZE      = 0
 # normally produced when WARNINGS is set to YES.
 # The default value is: NO.

-EXTRACT_ALL            = YES
+EXTRACT_ALL            = NO

 # If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
 # be included in the documentation.
@ -904,7 +904,7 @@ FILE_PATTERNS          = *.c \
 # be searched for input files as well.
 # The default value is: NO.

-RECURSIVE              = YES
+RECURSIVE              = NO

 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
@ -1493,7 +1493,7 @@ ECLIPSE_DOC_ID         = org.doxygen.Project
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.

-DISABLE_INDEX          = YES
+DISABLE_INDEX          = NO

 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information. If the tag
@ -1510,7 +1510,7 @@ DISABLE_INDEX          = YES
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.

-GENERATE_TREEVIEW      = YES
+GENERATE_TREEVIEW      = NO

 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
@ -2260,7 +2260,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # set to NO
 # The default value is: NO.

-HAVE_DOT               = YES
+HAVE_DOT               = NO

 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of
@ -2326,7 +2326,7 @@ GROUP_GRAPHS           = YES
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.

-UML_LOOK               = YES
+UML_LOOK               = NO

 # If the UML_LOOK tag is enabled, the fields and methods are shown inside the
 # class node. If there are many fields or methods and many nodes the graph may
@ -2377,7 +2377,7 @@ INCLUDED_BY_GRAPH      = YES
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.

-CALL_GRAPH             = YES
+CALL_GRAPH             = NO

 # If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
 # dependency graph for every global function or class method.
@ -2389,7 +2389,7 @@ CALL_GRAPH             = YES
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.

-CALLER_GRAPH           = YES
+CALLER_GRAPH           = NO

 # If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
 # hierarchy of all classes instead of a textual one.
--- a/doc/prototype_manual_DE.md
+++ b/doc/prototype_manual_DE.md
@ -0,0 +1,60 @@
+# Installation
+**[1]** In terminal als root einloggen\
+**[2]** In reHDD_prototype wechseln\
+**[3]** Abhängigkeiten installieren\
+`apt-get install smartmontools`\
+`apt-get install hwinfo`\
+`apt-get install util-linux`
+
+**[4]** reHDD ausführbar machen\
+`chmod +x reHDD`\
+**[5]** ignoreDrives.conf bearbeiten
+##### Ein Eintrag in der ignoreDrives-Datei sorgt dafür das die Software bestimmte Festplatten ignoriert. Dies ist wichtig damit nicht unbeabsichtigt die Systemfestplatte oder weitere Festplatten bearbeitet (gelöscht) werden.
+Beispiel Inhalt:
+```
+/dev/sda:508eff7d-f039-4efb-9e2c-22dffdfdfdfd
+/dev/sdb:07dfffff-c4b6-46e7-9cdf-3cfdfdffd53d
+/dev/sdc:dfff974d-1af2-4dfd-9dfd-a2d8e4c43dff
+```
+Ein Eintrag setzt sich aus zwei Teilen zusammen:
+
+**[Pfad]:[PARTUUID]**
+
+Der Pfad kann mittels `fdisk -l` ermittelt werden.\
+Die PARTUUID kann mittels `blkid /dev/sda` ermittelt werden, wobei `/dev/sda` derzuvor ermittelte Pfad ist.
+ 
+# Benutzung
+reHDD starten mit `./reHDD`  (Wichtig ist das reHDD mit root-Rechen ausgeführt wird, entwender als root einloggen oder mit `sudo`)
+
+reHDD sucht automatisch nach allen verfügbaren Festplatten und filtert die zu ignorierenden heraus.\
+Für die verbleibenden Festplatten wird eine Übersicht ausgegeben. 
+Der Nutzer wird gefragt, welche Festplatte bearbeitet werden soll und gibt die Nummer ein.
+
+Beispiel:
+
+```
+hostname@hendrik:/reHDD_prototype # ./reHDD 
+refurbishingHddTool
+created app
+app logic
+search drives ...
+------------DRIVES---------------
+        Drive: 0
+Path:          /dev/sdd
+ModelFamily:   
+ModelName:     ADATA SU650
+Capacity:      120034123776
+Serial:        H50125K001601
+PowerOnHours:  93
+PowerCycle:    187
+ErrorCount:    0
+
+---------------------------------
+Select drive to wipe:
+0
+Selected drive index: 0
+wipe: shred -v /dev/sdd
+shred: /dev/sdd: Durchgang 1/3 (random)…
+shred: /dev/sdd: Durchgang 1/3 (random)…847MiB/112GiB 0%
+...
+```
--- a/doc/screenshot.png
+++ b/doc/screenshot.png
--- a/doc/update.sh
+++ b/doc/update.sh
@ -0,0 +1,26 @@
+#! /usr/bin/bash
+
+echo starting update
+
+FILE=./ignoreDrives.conf
+if test -f "$FILE"; then
+   echo backup exits
+else
+    cp reHDD/ignoreDrives.conf ./ignoreDrives.conf
+fi
+
+cd  reHDD
+
+git reset
+
+git stash force 
+
+git stash
+
+git checkout master
+
+git pull
+
+make release
+
+cp ../ignoreDrives.conf ./
--- a/ignoreDrives.conf
+++ b/ignoreDrives.conf
@ -1,3 +1,2 @@
 4673974d
 2cb3dea4
-8ffbc421
--- a/include/delete.h
+++ b/include/delete.h
@ -13,11 +13,13 @@
 class Delete
 {
 protected:
+
 public:
    static void deleteDrive(Drive* drive);

 private:
    Delete(void);
+
 };

 #endif  // DELETE_H_
--- a/include/drive.h
+++ b/include/drive.h
@ -14,12 +14,9 @@ class Drive
 {

 public:
-    enum TaskState
-    {
-        NONE,
+    enum TaskState {NONE,
                    SHRED_SELECTED,
-        SHRED_ACTIVE, // shred iterations active
-        CHECK_ACTIVE, // optional checking active
+                    SHRED_ACTIVE,
                    DELETE_SELECTED,
                    DELETE_ACTIVE,
                    FROZEN
@ -30,24 +27,15 @@ public:
        time_t u32ShredTimeDelta;
        std::chrono::time_point<std::chrono::system_clock> chronoShredTimestamp;
        unsigned long ulWrittenBytes;
-        unsigned long ulSpeedMetricBytesWritten;
    } sShredSpeed;

-    bool bWasShredded = false; // all shred iterations done
-    bool 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;

 private:
    string sPath;
-    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
-    {
    string sModelFamily;
    string sModelName;
    string sSerial;
@ -55,13 +43,16 @@ private:
    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;
+    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

 private:
    void setTimestamp();

 protected:
+
 public:
    Drive(string path)
    {
@ -76,7 +67,6 @@ public:
    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( string modelFamily,
@ -85,14 +75,12 @@ public:
                            uint64_t capacity,
                            uint32_t errorCount,
                            uint32_t powerOnHours,
-                           uint32_t powerCycles,
-                           uint32_t temperature);
+                            uint32_t powerCycles);

    string sCapacityToText();
    string sErrorCountToText();
    string sPowerOnHoursToText();
    string sPowerCyclesToText();
-    string sTemperatureToText();

    void setTaskPercentage(double d32TaskPercentage);
    double getTaskPercentage(void);
@ -102,6 +90,7 @@ public:

    void calculateTaskDuration();
    time_t getTaskDuration();
+
 };

 #endif  // DRIVE_H_
--- a/include/logger/logger.h
+++ b/include/logger/logger.h
@ -68,6 +68,7 @@ private:
    ~Logger();

 public:
+
    void info(string s);
    void warning(string s);
    void error(string s);
--- a/include/printer.h
+++ b/include/printer.h
@ -1,56 +0,0 @@
-/**
- * @file    printer.h
- * @brief   Send drive data to printer service using ipc msg queue
- * @author  Hendrik Schutter
- * @date    24.11.2022
- */
-
-#ifndef PRINTER_H_
-#define PRINTER_H_
-
-#include "reHDD.h"
-
-#include <sys/ipc.h>
-#include <sys/msg.h>
-
-#define STR_BUFFER_SIZE 64U
-#define IPC_MSG_QUEUE_KEY 0x1B11193C0
-
-typedef struct
-{
-    char caDriveIndex[STR_BUFFER_SIZE];
-    char caDriveHours[STR_BUFFER_SIZE];
-    char caDriveCycles[STR_BUFFER_SIZE];
-    char caDriveErrors[STR_BUFFER_SIZE];
-    char caDriveShredTimestamp[STR_BUFFER_SIZE];
-    char caDriveShredDuration[STR_BUFFER_SIZE];
-    char caDriveCapacity[STR_BUFFER_SIZE];
-    char caDriveState[STR_BUFFER_SIZE];
-    char caDriveModelFamily[STR_BUFFER_SIZE];
-    char caDriveModelName[STR_BUFFER_SIZE];
-    char caDriveSerialnumber[STR_BUFFER_SIZE];
-    char caDriveReHddVersion[STR_BUFFER_SIZE];
-
-} t_driveData;
-
-typedef struct
-{
-    long msg_queue_type;
-    t_driveData driveData;
-} t_msgQueueData;
-
-class Printer
-{
-protected:
-public:
-    static Printer *getPrinter();
-    void print(Drive *drive);
-
-private:
-    static bool instanceFlag;
-    static Printer *single;
-    int msqid;
-    Printer();
-    ~Printer();
-};
-#endif // PRINTER_H_
--- a/include/reHDD.h
+++ b/include/reHDD.h
@ -8,32 +8,29 @@
 #ifndef REHDD_H_
 #define REHDD_H_

-#define REHDD_VERSION "V1.1.2"
+#define REHDD_VERSION "bV0.2.1"

 // 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 3
+#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 2024"
+#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
+#define LOG_LEVEL_HIGH  //log everything, like drive scann thread
 #ifndef LOG_LEVEL_HIGH
 #define LOG_LEVEL_LOW   //log only user actions and tasks 
 #endif

 // Logic
-//#define DRYRUN       // don't touch the drives
+//#define DRYRUN //don´t touch the drives
 #define FROZEN_ALERT //show alert if drive is frozen
-#define ZERO_CHECK   // check drive after shred if all bytes are zero, show alert if this fails

 //IPC pipes
 #define READ 0
@ -61,16 +58,14 @@ using namespace std;

 #include "drive.h"
 #include "smart.h"
-#include "shred.h"
+#include "shred/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));
 }
@ -78,22 +73,21 @@ T *iterator_to_pointer(I i)
 class reHDD
 {
 protected:
+
 public:
    reHDD(void);
    static void app_logic();

 private:
+
    static void searchDrives(list <Drive>* plistDrives);
    static void printDrives(list <Drive>* plistDrives);
-    static void startShredAllDrives(list<Drive> *plistDrives);
-    static void updateShredMetrics(list<Drive> *plistDrives);
    static  void filterIgnoredDrives(list <Drive>* plistDrives);
-    static void filterInvalidDrives(list<Drive> *plistDrives);
    static void filterNewDrives(list <Drive>* plistOldDrives, list <Drive>* plistNewDrives);
    static void addSMARTData(list <Drive>* plistDrives);
-    static void ThreadScanDevices();
+    static void ThreadScannDevices();
    static void ThreadUserInput();
-    static void ThreadShred(Drive *const pDrive);
+    static void ThreadShred();
    static void ThreadDelete();
    static void ThreadCheckFrozenDrives();
    static void handleArrowKey(TUI::UserInput userInput);
@ -101,7 +95,6 @@ private:
    static void handleESC();
    static void handleAbort();
    static Drive* getSelectedDrive();
-    static bool getSystemDrive(string &systemDrive);
 };

 #endif  // REHDD_H_
--- a/include/shred.h
+++ b/include/shred.h
@ -1,55 +0,0 @@
-/**
- * @file    shred.h
- * @brief   shred drive
- * @author  hendrik schutter
- * @date    03.05.2020
- */
-
-#ifndef SHRED_H_
-#define SHRED_H_
-
-#include "reHDD.h"
-
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include <fcntl.h>
-#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 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;
-
-class Shred
-{
-protected:
-public:
-    Shred();
-    ~Shred();
-    int shredDrive(Drive *drive, int *ipSignalFd);
-
-private:
-    fileDescriptor randomSrcFileDiscr;
-    fileDescriptor driveFileDiscr;
-    unsigned char caTfngData[TFNG_DATA_SIZE];
-    unsigned char caReadBuffer[CHUNK_SIZE];
-    unsigned long ulDriveByteSize;
-    unsigned long ulDriveByteOverallCount = 0; // all bytes shredded in all iterations + checking -> used for progress calculation
-    double d32Percent = 0.0;
-    double d32TmpPercent = 0.0;
-
-    inline double calcProgress();
-    int iRewindDrive(fileDescriptor file);
-    unsigned long getDriveSizeInBytes(fileDescriptor file);
-    unsigned int uiCalcChecksum(fileDescriptor file, Drive *drive, int *ipSignalFd);
-    void cleanup();
-};
-
-#endif // SHRED_H_
--- a/include/shred/machdefs.h
+++ b/include/shred/machdefs.h
@ -0,0 +1,19 @@
+#ifndef _MACHINE_DEFINITIONS_HEADER
+#define _MACHINE_DEFINITIONS_HEADER
+
+#include <stdint.h>
+#include <limits.h>
+
+#undef MACHINE_16BIT
+#undef MACHINE_32BIT
+#undef MACHINE_64BIT
+
+#if UINTPTR_MAX == UINT32_MAX
+#define MACHINE_32BIT
+#elif UINTPTR_MAX == UINT64_MAX
+#define MACHINE_64BIT
+#elif UINTPTR_MAX == UINT16_MAX
+#define MACHINE_16BIT
+#endif
+
+#endif
--- a/include/shred/shred.h
+++ b/include/shred/shred.h
@ -0,0 +1,100 @@
+/**
+ * @file    shred.h
+ * @brief   shred drive
+ * @author  hendrik schutter
+ * @date    03.05.2020
+ */
+
+#ifndef SHRED_H_
+#define SHRED_H_
+
+#include "../reHDD.h"
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <limits.h>
+#include <libgen.h>
+
+
+#include "tfdef.h"
+#include "tfcore.h"
+//#include "tfe.h"
+
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE
+#endif
+#ifndef _BSD_SOURCE
+#define _BSD_SOURCE
+#endif
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 700
+#endif
+#ifndef _LARGEFILE64_SOURCE
+#define _LARGEFILE64_SOURCE
+#endif
+#ifndef _FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS 64
+#endif
+
+#ifndef _TFNG_STREAM_CIPHER_DEFS
+#define _TFNG_STREAM_CIPHER_DEFS
+#endif
+
+#define PROCESS_BLOCKP(x,k1,k2,k3,k4,k5,k6)						\
+	do {										\
+		KE_MIX(Y, X, k1 + k2, k3, TFS_KS01);					\
+		KE_MIX(T, Z, k4 + x, k5 + k6, TFS_KS02);				\
+											\
+		BE_MIX(X, T, TFS_BS01); BE_MIX(Z, Y, TFS_BS02);				\
+		BE_MIX(X, Y, TFS_BS03); BE_MIX(Z, T, TFS_BS04);				\
+		BE_MIX(X, T, TFS_BS05); BE_MIX(Z, Y, TFS_BS06);				\
+	} while (0)
+
+#define PROCESS_BLOCKN(x,k1,k2,k3,k4,k5,k6)						\
+	do {										\
+		KE_MIX(Y, X, k1 + k2, k3, TFS_KS03);					\
+		KE_MIX(T, Z, k4 + x, k5 + k6, TFS_KS04);				\
+											\
+		BE_MIX(X, T, TFS_BS07); BE_MIX(Z, Y, TFS_BS08);				\
+		BE_MIX(X, Y, TFS_BS09); BE_MIX(Z, T, TFS_BS10);				\
+		BE_MIX(X, T, TFS_BS11); BE_MIX(Z, Y, TFS_BS12);				\
+	} while (0)
+
+
+#define NOSIZE ((size_t)-1)
+
+#define XRET(x) if (!xret && xret < x) xret = x
+
+class Shred
+{
+protected:
+
+public:
+
+    Shred();
+    ~Shred();
+    void shredDrive(Drive* drive, int* ipSignalFd);
+
+private:
+
+    unsigned long blockcount = 0UL;
+    long blockcount_max;
+    double d32Percent;
+
+    inline double calcProgress();
+    inline void tfnge_init_iv(struct tfnge_stream *tfe, const void *key, const void *iv);
+    inline void tfnge_init(struct tfnge_stream *tfe, const void *key);
+    inline void tfng_encrypt_rawblk(TFNG_UNIT_TYPE *O, const TFNG_UNIT_TYPE *I, const TFNG_UNIT_TYPE *K);
+    inline void tfnge_emit(void *dst, size_t szdst, struct tfnge_stream *tfe);
+
+    void printRandomBufferChecksum(char* buf, size_t szdst);
+
+};
+
+#endif  // SHRED_H_
--- a/include/shred/tfcore.h
+++ b/include/shred/tfcore.h
@ -0,0 +1,51 @@
+#ifndef _THREEFISH_NOISE_GENERATOR_CIPHER_CORE_HEADER
+#define _THREEFISH_NOISE_GENERATOR_CIPHER_CORE_HEADER
+
+#ifndef _THREEFISH_NOISE_GENERATOR_CIPHER_DEFINITIONS_HEADER
+#error Threefish definitions header is required! Include tfdef.h first.
+#endif
+
+#define ROL(x, s, max) ((x << s) | (x >> (-s & (max-1))))
+#define ROR(x, s, max) ((x >> s) | (x << (-s & (max-1))))
+
+#define KE_MIX(x, y, k1, k2, sl)				\
+	do {							\
+		x += k1;					\
+		y += x;						\
+		y += k2;					\
+		x = ROL(x, sl, TFNG_UNIT_BITS);			\
+		x ^= y;						\
+	} while (0)
+
+#define BE_MIX(x, y, sl)					\
+	do {							\
+		x += y;						\
+		y = ROL(y, sl, TFNG_UNIT_BITS);			\
+		y ^= x;						\
+	} while (0)
+
+#define KD_MIX(x, y, k1, k2, sr)				\
+	do {							\
+		x ^= y;						\
+		x = ROR(x, sr, TFNG_UNIT_BITS);			\
+		y -= x;						\
+		y -= k2;					\
+		x -= k1;					\
+	} while (0)
+
+#define BD_MIX(x, y, sr)					\
+	do {							\
+		y ^= x;						\
+		y = ROR(y, sr, TFNG_UNIT_BITS);			\
+		x -= y;						\
+	} while (0)
+
+enum tfng_rotations
+{
+    TFS_KS01 =  7, TFS_KS02 = 25, TFS_KS03 = 19, TFS_KS04 =  7,
+    TFS_BS01 =  5, TFS_BS02 = 27, TFS_BS03 = 26, TFS_BS04 =  6,
+    TFS_BS05 = 14, TFS_BS06 = 11, TFS_BS07 = 24, TFS_BS08 = 18,
+    TFS_BS09 =  9, TFS_BS10 = 24, TFS_BS11 =  6, TFS_BS12 =  7,
+};
+
+#endif
--- a/include/shred/tfdef.h
+++ b/include/shred/tfdef.h
@ -0,0 +1,39 @@
+#ifndef _THREEFISH_NOISE_GENERATOR_CIPHER_DEFINITIONS_HEADER
+#define _THREEFISH_NOISE_GENERATOR_CIPHER_DEFINITIONS_HEADER
+
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE
+#endif
+
+#ifndef _BSD_SOURCE
+#define _BSD_SOURCE
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+#include "machdefs.h"
+
+#if defined(MACHINE_64BIT)
+#define TFNG_UNIT_TYPE uint64_t
+#define TFNG_NR_BLOCK_BITS 256
+#define TFNG_NR_KEY_BITS 512
+#else
+#define TFNG_UNIT_TYPE uint32_t
+#define TFNG_NR_BLOCK_BITS 128
+#define TFNG_NR_KEY_BITS 256
+#endif
+
+#define TFNG_NR_BLOCK_UNITS 4
+#define TFNG_NR_KEY_UNITS 8
+
+#define TFNG_BYTE_TYPE uint8_t
+#define TFNG_SIZE_UNIT (sizeof(TFNG_UNIT_TYPE))
+#define TFNG_BLOCK_SIZE (TFNG_SIZE_UNIT * TFNG_NR_BLOCK_UNITS)
+#define TFNG_KEY_SIZE (TFNG_SIZE_UNIT * TFNG_NR_KEY_UNITS)
+
+#define TFNG_TO_BITS(x) ((x) * 8)
+#define TFNG_FROM_BITS(x) ((x) / 8)
+#define TFNG_MAX_BITS TFNG_NR_BLOCK_BITS
+#define TFNG_UNIT_BITS (TFNG_SIZE_UNIT * 8)
+
+#endif
--- a/include/smart.h
+++ b/include/smart.h
@ -13,21 +13,28 @@
 class SMART
 {
 protected:
+
 public:
    static void readSMARTData(Drive* drive);

 private:
    SMART(void);

-    static bool parseExitStatus(string sLine, uint8_t &status);
-    static bool parseModelFamily(string sLine, string &modelFamily);
-    static bool parseModelName(string sLine, string &modelName);
-    static bool parseSerial(string sLine, string &serial);
-    static bool parseCapacity(string sLine, uint64_t &capacity);
-    static bool parseErrorCount(string sLine, uint32_t &errorCount);
-    static bool parsePowerOnHours(string sLine, uint32_t &powerOnHours);
-    static bool parsePowerCycles(string sLine, uint32_t &powerCycles);
-    static bool parseTemperature(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_
--- a/include/tui.h
+++ b/include/tui.h
@ -12,27 +12,17 @@

 #define COLOR_AREA_STDSCR 1
 #define COLOR_AREA_OVERVIEW 2
-#define COLOR_AREA_ENTRY_EVEN 3
-#define COLOR_AREA_ENTRY_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,
-        Undefined
-    };
+
+    enum UserInput { UpKey, DownKey, Abort, Shred, Delete, Enter, ESC, Undefined};
    struct MenuState
    {
        bool bAbort;
@ -66,17 +56,16 @@ private:
    static WINDOW *createOverViewWindow( int iXSize, int iYSize);
    static WINDOW *createDetailViewWindow( int iXSize, int iYSize, int iXStart, Drive drive);
    static WINDOW *overwriteDetailViewWindow( int iXSize, int iYSize, int iXStart);
-    static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, bool bSelected);
+    static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, string sModelFamily, string sModelName, string sCapacity, string sState, string sTime, string sSpeed, bool bSelected);
    static WINDOW *createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart);
    static WINDOW *createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, struct MenuState menustate);
    static WINDOW *createDialog(int iXSize, int iYSize, int iXStart, int iYStart, string selectedTask, string optionA, string optionB);
    static WINDOW* createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, string sProgress);
-    static WINDOW *createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles, uint32_t u32ErrorCount, uint32_t u32Temperature);
-    static WINDOW *createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, uint32_t u32Checksum);
+    static WINDOW* createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles,  uint32_t u32ErrorCount);

    void displaySelectedDrive(Drive drive, int stdscrX, int stdscrY);
    string formatTimeDuration(time_t u32Duration);
    string formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes);
-    static void vTruncateText(string *psText, uint16_t u16MaxLenght);
+
 };
 #endif  // TUI_H_
--- a/18
+++ b/18
@ -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
 # Additional debug-specific flags
 DCOMPILE_FLAGS = -D DEBUG
 # Add additional include paths
 INCLUDES = include
 # General linker settings
-LINK_FLAGS = -Llib -lpthread -lncurses -ltfng
-
+LINK_FLAGS = -lpthread -lncurses
 # Doc
 DOCDIR = doc
-TFRANDDIR = tfnoisegen
-TFRANDLIB = libtfng.a
 #### END PROJECT SETTINGS ####

 # Optionally you may move the section above to a separate config.mk file, and
@ -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 $@
--- a/reHDD_random.log
+++ b/reHDD_random.log
--- a/reHDD_speed_test.ods
+++ b/reHDD_speed_test.ods
--- a/scripts/getty@tty1.service.d_override.conf
+++ b/scripts/getty@tty1.service.d_override.conf
@ -1,17 +0,0 @@
-[Unit]
-Description=reHDD on tty1
-
-[Service]
-WorkingDirectory=/root/reHDD/
-ExecStart=
-ExecStart=-/root/reHDD/reHDD
-StandardInput=tty
-StandardOutput=tty
-Restart=always
-RestartSec=1
-UtmpIdentifier=tty1
-TTYPath=/dev/tty1
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-SendSIGHUP=yes
--- a/scripts/getty@tty2.service.d_override.conf
+++ b/scripts/getty@tty2.service.d_override.conf
@ -1,17 +0,0 @@
-[Unit]
-Description=dmesg on tty2
-
-[Service]
-WorkingDirectory=/usr/bin/
-ExecStart=
-ExecStart=-/usr/bin/dmesg -wHT
-StandardInput=tty
-StandardOutput=tty
-Restart=always
-RestartSec=1
-UtmpIdentifier=tty2
-TTYPath=/dev/tty2
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-SendSIGHUP=yes
--- a/scripts/getty@tty3.service.d_override.conf
+++ b/scripts/getty@tty3.service.d_override.conf
@ -1,17 +0,0 @@
-[Unit]
-Description=htop on tty3
-
-[Service]
-WorkingDirectory=/usr/bin/
-ExecStart=
-ExecStart=-/usr/bin/htop
-StandardInput=tty
-StandardOutput=tty
-Restart=always
-RestartSec=1
-UtmpIdentifier=tty3
-TTYPath=/dev/tty3
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-SendSIGHUP=yes
--- a/scripts/install_reHDD.bash
+++ b/scripts/install_reHDD.bash
@ -1,27 +0,0 @@
-#!/bin/bash
-
-cd /root/reHDD/scripts/
-
-chmod +x reHDDLogUploader.bash
-cp reHDDLogUploader.service /lib/systemd/system/reHDDLogUploader.service
-cp reHDDLogUploader.timer /lib/systemd/system/reHDDLogUploader.timer
-systemctl daemon-reload
-systemctl enable /lib/systemd/system/reHDDLogUploader.timer
-
-chmod +x reHDDStartHelper.bash
-cp reHDDStartHelper.service /lib/systemd/system/reHDDStartHelper.service
-systemctl daemon-reload
-systemctl enable /lib/systemd/system/reHDDStartHelper.service
-
-mkdir -p /lib/systemd/system/getty@tty1.service.d
-cp getty@tty1.service.d_override.conf /lib/systemd/system/getty@tty1.service.d/override.conf
-systemctl daemon-reload
-
-mkdir -p /lib/systemd/system/getty@tty2.service.d
-cp getty@tty2.service.d_override.conf /lib/systemd/system/getty@tty2.service.d/override.conf
-systemctl daemon-reload
-
-mkdir -p /lib/systemd/system/getty@tty3.service.d
-cp getty@tty3.service.d_override.conf /lib/systemd/system/getty@tty3.service.d/override.conf
-systemctl daemon-reload
-
--- a/scripts/reHDDLogUploader.bash
+++ b/scripts/reHDDLogUploader.bash
@ -1,6 +0,0 @@
-#!/bin/bash
-# remove comment for the following to activate log telemetie
-curl -k -T /root/reHDD/reHDD.log -u "__Place_your_token_here__:" -H 'X-Requested-With: XMLHttpRequest' https://schuttercloud.com/public.php/webdav/`echo $(date '+%Y-%m-%d_%H-%M')`_reHDD.log
-rm -f /root/reHDD/reHDD.log
-
-
--- a/scripts/reHDDLogUploader.service
+++ b/scripts/reHDDLogUploader.service
@ -1,18 +0,0 @@
-[Unit]
-Description=reHDD log uploader
-After=syslog.target
-After=network.target
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=oneshot
-User=root
-Group=root
-RemainAfterExit=yes
-ExecStart=/usr/bin/bash /root/reHDD/scripts/reHDDLogUploader.bash
-
-[Install]
-WantedBy=multi-user.target
-
-
--- a/scripts/reHDDLogUploader.timer
+++ b/scripts/reHDDLogUploader.timer
@ -1,11 +0,0 @@
-[Unit]
-Description=reHDD log uploader timer
-
-[Timer]
-OnActiveSec=30s
-OnBootSec=10min
-OnUnitActiveSec=12h
-
-[Install]
-WantedBy=basic.target
-
--- a/scripts/reHDDStartHelper.bash
+++ b/scripts/reHDDStartHelper.bash
@ -1,4 +0,0 @@
-#!/bin/bash
-dmesg -n 1 #disable overlay if a drive is attached/detached
-
-
--- a/scripts/reHDDStartHelper.service
+++ b/scripts/reHDDStartHelper.service
@ -1,16 +0,0 @@
-[Install]
-WantedBy=multi-user.target
-
-[Unit]
-Description=reHDD start helper
-After=syslog.target
-
-[Service]
-Type=oneshot
-User=root
-Group=root
-RemainAfterExit=yes
-ExecStart=/usr/bin/bash /root/reHDD/scripts/reHDDStartHelper.bash
-
-[Install]
-WantedBy=multi-user.target
--- a/scripts/update.sh
+++ b/scripts/update.sh
@ -1,36 +0,0 @@
-#! /usr/bin/bash
-
-echo starting update
-
-systemctl stop /lib/systemd/system/getty@tty1.service.d
-
-cd /root/reHDD/
-
-FILE=../ignoreDrives.conf
-if test -f "$FILE"; then
-   echo "backup exits already"
-else
-    cp /root/reHDD/ignoreDrives.conf /root/ignoreDrives.conf
-fi
-
-git reset
-
-git stash force 
-
-git stash
-
-git checkout master
-
-git pull
-
-git submodule init
-
-git submodule update
-
-make clean
-
-make release
-
-cp  /root/ignoreDrives.conf /root/reHDD/ignoreDrives.conf
-
-systemctl start /lib/systemd/system/getty@tty1.service.d
--- a/shred_dummy.sh
+++ b/shred_dummy.sh
@ -0,0 +1,12 @@
+#! /bin/bash
+
+echo "starting SHRED DUMMY"
+
+for i in {0..100..10}
+do
+   #echo "DUMMY shred  $i%"
+   echo $date > out.txt
+   sleep 1
+done
+
+echo "finished SHRED DUMMY"
--- a/src/drive.cpp
+++ b/src/drive.cpp
@ -14,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()
@ -72,6 +67,7 @@ string Drive::sErrorCountToText()
    return to_string(getErrorCount());
 }

+
 string Drive::sPowerOnHoursToText()
 {
    double dDays = 0U;
@ -96,12 +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)
@ -115,6 +105,7 @@ double Drive::getTaskPercentage(void)
    return this->d32TaskPercentage;
 }

+
 /**
 * \brief   set S.M.A.R.T. values in model
 * \param	string modelFamily
@ -124,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,
@ -133,17 +123,16 @@ 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()
@ -179,10 +168,10 @@ void Drive::checkFrozenDrive(void)
    time_t u32localtime;
    time(&u32localtime);

-    if ((u32localtime - this->u32Timestamp) >= (FROZEN_TIMEOUT * 60) && (this->u32Timestamp > 0) && (this->getTaskPercentage() < 100.0))
+    if((u32localtime - this->u32Timestamp) >= (FROZEN_TIMEOUT*60) && (this->u32Timestamp > 0))
        {
            Logger::logThis()->warning("Drive Frozen: " + this->getModelName() + " " + this->getSerial());
-        this->bWasDeleted = false;
+            this->bWasDeleteted = false;
            this->bWasShredded = false;
            this->state = Drive::FROZEN;
        }
--- a/src/logger/logger.cpp
+++ b/src/logger/logger.cpp
@ -5,6 +5,7 @@
 * @date    04.09.2020
 */

+
 #include "../../include/reHDD.h" //for logger settings
 #include "../../include/logger/logger.h"

@ -17,6 +18,8 @@ Logger *Logger::single = NULL;

 /**
 * \brief   create new logger instance
+ * \param	path to log file
+ * \param	struct with data
 * \return  instance of Logger
 */
 Logger::Logger()
@ -152,6 +155,7 @@ string Logger::getMacAddress()
    if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
        {
            strcpy(ifr.ifr_name, "eno1");
+
        }

    unsigned char *hwaddr = (unsigned char *)ifr.ifr_hwaddr.sa_data;
@ -227,3 +231,5 @@ Logger *Logger::logThis()
            return single; //return existing obj
        }
 }
+
+
--- a/src/printer.cpp
+++ b/src/printer.cpp
@ -1,84 +0,0 @@
-/**
- * @file    printer.cpp
- * @brief   Send drive data to printer service using ipc msg queue
- * @author  Hendrik Schutter
- * @date    24.11.2022
- */
-
-#include "../include/reHDD.h"
-
-bool Printer::instanceFlag = false;
-Printer *Printer::single = NULL;
-
-/**
- * \brief   create new Printer instance
- * \param	path to log file
- * \param	struct with data
- * \return  instance of Printer
- */
-Printer::Printer()
-{
-    if (-1 == (this->msqid = msgget((key_t)IPC_MSG_QUEUE_KEY, IPC_CREAT | 0666)))
-    {
-        Logger::logThis()->error("Printer: Create mgs queue failed!");
-    }
-}
-
-/**
- * \brief   deconstructor
- * \return  void
- */
-Printer::~Printer()
-{
-    instanceFlag = false;
-}
-
-/**
- * \brief   send data to msg queue
- * \return  void
- */
-void Printer::print(Drive *drive)
-{
-    t_msgQueueData msgQueueData;
-    msgQueueData.msg_queue_type = 1;
-
-    sprintf(msgQueueData.driveData.caDriveIndex, "%i", 42); // TODO: get from tui
-    sprintf(msgQueueData.driveData.caDriveState, "shredded");
-    strcpy(msgQueueData.driveData.caDriveModelFamily, drive->getModelFamily().c_str());
-    strcpy(msgQueueData.driveData.caDriveModelName, drive->getModelName().c_str());
-    sprintf(msgQueueData.driveData.caDriveCapacity, "%li", drive->getCapacity());
-    strcpy(msgQueueData.driveData.caDriveSerialnumber, drive->getSerial().c_str());
-    sprintf(msgQueueData.driveData.caDriveHours, "%i", drive->getPowerOnHours());
-    sprintf(msgQueueData.driveData.caDriveCycles, "%i", drive->getPowerCycles());
-    sprintf(msgQueueData.driveData.caDriveErrors, "%i", drive->getErrorCount());
-    sprintf(msgQueueData.driveData.caDriveShredTimestamp, "%li", drive->getActionStartTimestamp());
-    sprintf(msgQueueData.driveData.caDriveShredDuration, "%li", drive->getTaskDuration());
-    sprintf(msgQueueData.driveData.caDriveReHddVersion, REHDD_VERSION);
-
-    if (-1 == msgsnd(this->msqid, &msgQueueData, sizeof(t_msgQueueData) - sizeof(long), 0))
-    {
-        Logger::logThis()->error("Printer: Send mgs queue failed!");
-    }
-    else
-    {
-        Logger::logThis()->info("Printer: print triggered - Drive: " + drive->getSerial());
-    }
-}
-
-/**
- * \brief   return a instance of the printer
- * \return  printer obj
- */
-Printer *Printer::getPrinter()
-{
-    if (!instanceFlag)
-    {
-        single = new Printer(); // create new obj
-        instanceFlag = true;
-        return single;
-    }
-    else
-    {
-        return single; // return existing obj
-    }
-}
--- a/src/reHDD.cpp
+++ b/src/reHDD.cpp
@ -11,11 +11,11 @@ static int fdNewDrivesInformPipe[2]; // File descriptor for pipe that informs if

 static int fdShredInformPipe[2];//File descriptor for pipe that informs if a wipe thread signals

-static std::mutex mxDrives;
+static std::mutex mxScannDrives;

 list <Drive> listNewDrives; //store found drives that are updated every 5sec

-static list<Drive> listDrives; // stores all drive data from scan thread
+static list <Drive> listDrives; //stores all drive data from scann thread

 TUI *ui;

@ -46,7 +46,7 @@ void reHDD::app_logic(void)
    pipe(fdNewDrivesInformPipe);
    pipe(fdShredInformPipe);

-    thread thDevices(ThreadScanDevices);                 // start thread that scans for drives
+    thread thDevices(ThreadScannDevices); //start thread that scanns for drives
    thread thUserInput(ThreadUserInput); //start thread that reads user input
    thread thCheckFrozenDrives(ThreadCheckFrozenDrives); //start thread that checks timeout for drives

@ -60,18 +60,17 @@ void reHDD::app_logic(void)

            if(FD_ISSET(fdNewDrivesInformPipe[0], &selectSet))
                {
-            mxDrives.lock();
+                    mxScannDrives.lock();
                    char dummy;
                    read (fdNewDrivesInformPipe[0],&dummy,1);
                    filterNewDrives(&listDrives, &listNewDrives); //filter and copy to app logic vector
                    printDrives(&listDrives);
-            mxDrives.unlock();
+                    mxScannDrives.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
@ -98,17 +97,16 @@ Drive *reHDD::getSelectedDrive()
        }
 }

-void reHDD::ThreadScanDevices()
+void reHDD::ThreadScannDevices()
 {
    while(true)
        {
-        mxDrives.lock();
+            mxScannDrives.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();
+            mxScannDrives.unlock();
            write(fdNewDrivesInformPipe[1], "A",1);
            sleep(5); //sleep 5 sec
        }
@ -118,7 +116,7 @@ void reHDD::ThreadCheckFrozenDrives()
 {
    while(true)
        {
-        mxDrives.lock();
+            mxScannDrives.lock();
            for(auto it = begin(listDrives); it != end(listDrives); ++it)
                {
                    if(it->state == Drive::SHRED_ACTIVE)
@ -126,7 +124,7 @@ void reHDD::ThreadCheckFrozenDrives()
                            it->checkFrozenDrive();
                        }
                }
-        mxDrives.unlock();
+            mxScannDrives.unlock();
            sleep(13); //sleep 13 sec
        }
 }
@ -166,7 +164,6 @@ void reHDD::ThreadUserInput()
                                    getSelectedDrive()->state = Drive::DELETE_SELECTED;
                                }
                        }
-
                    ui->updateTUI(&listDrives, u8SelectedEntry);
                    break;
                case TUI::UserInput::Shred:
@ -179,12 +176,6 @@ void reHDD::ThreadUserInput()
                                    getSelectedDrive()->state = Drive::SHRED_SELECTED;
                                }
                        }
-
-            ui->updateTUI(&listDrives, u8SelectedEntry);
-            break;
-        case TUI::UserInput::ShredAll:
-            // cout << "ShredAll" << endl;
-            startShredAllDrives(&listDrives);
                    ui->updateTUI(&listDrives, u8SelectedEntry);
                    break;
                case TUI::UserInput::Enter:
@ -203,13 +194,13 @@ void reHDD::ThreadUserInput()
        }
 }

-void reHDD::ThreadShred(Drive *const pDrive)
+void reHDD::ThreadShred()
 {
-    if (pDrive != nullptr)
+    if (getSelectedDrive() != nullptr)
        {
-        pDrive->setActionStartTimestamp();                     // save timestamp at start of shredding
+            getSelectedDrive()->setActionStartTimestamp(); //save timestamp at start of shredding
            Shred* pShredTask = new Shred(); //create new shred task
-        pShredTask->shredDrive(pDrive, &fdShredInformPipe[1]); // start new shred task
+            pShredTask->shredDrive(getSelectedDrive(), &fdShredInformPipe[1]); //start new shred task
            delete pShredTask; //delete shred task
            ui->updateTUI(&listDrives, u8SelectedEntry);
        }
@ -222,7 +213,7 @@ void reHDD::ThreadDelete()
            getSelectedDrive()->setActionStartTimestamp(); //save timestamp at start of deleting
            Delete::deleteDrive(getSelectedDrive()); //blocking, no thread
            getSelectedDrive()->state = Drive::TaskState::NONE; //delete finished
-        getSelectedDrive()->bWasDeleted = true;
+            getSelectedDrive()->bWasDeleteted = true;
            Logger::logThis()->info("Finished delete for: " + getSelectedDrive()->getModelName() + "-" +  getSelectedDrive()->getSerial());
            ui->updateTUI(&listDrives, u8SelectedEntry);
        }
@ -231,7 +222,7 @@ void reHDD::ThreadDelete()
 void reHDD::filterNewDrives(list <Drive>* plistOldDrives, list <Drive>* plistNewDrives)
 {
    list <Drive>::iterator itOld; //Iterator for current (old) drive list
-    list<Drive>::iterator itNew; // Iterator for new drive list that was created from to scan thread
+    list <Drive>::iterator itNew; //Iterator for new drive list that was created from to scann thread

    //remove offline old drives from previously run
    for (itOld = plistOldDrives->begin(); itOld != plistOldDrives->end();)
@ -255,18 +246,16 @@ void reHDD::filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDr
    //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
+            itOld->bIsOffline = true; //set offline befor seachring 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());
+                            Logger::logThis()->info("Delete new drive, because allready attached: " + itNew->getModelName());
 #endif
-                itNew = plistNewDrives->erase(itNew); // This drive is already attached, remove from new list
+                            itNew = plistNewDrives->erase(itNew); //This drive is allready attached, remove from new list
                        }
                    else
                        {
@ -290,7 +279,7 @@ void reHDD::filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDr
    for (itNew = plistNewDrives->begin(); itNew != plistNewDrives->end(); ++itNew)
        {
            plistOldDrives->push_back(*itNew);
-        // Logger::logThis()->info("Add new drive: " + itNew->getModelName());
+            Logger::logThis()->info("Add new drive: " + itNew->getModelName());
        }
    plistNewDrives->clear();
 }
@ -302,11 +291,11 @@ void reHDD::filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDr
 */
 void reHDD::searchDrives(list <Drive>* plistDrives)
 {
-    // Logger::logThis()->info("-->    search drives   <--");
+    Logger::logThis()->info("-->    search drives   <--");
    char * cLine = NULL;
    size_t len = 0;

-    FILE *outputfileHwinfo = popen("lsblk -e 11 -d -o NAME", "r");
+    FILE* outputfileHwinfo = popen("lsblk -I 8 -d -o NAME", "r");

    if (outputfileHwinfo == NULL)
        {
@ -322,16 +311,7 @@ void reHDD::searchDrives(list<Drive> *plistDrives)
                    tmpDrive->state = Drive::NONE;
                    tmpDrive->bIsOffline = false;
                    plistDrives->push_back(*tmpDrive);
-            // Logger::logThis()->info("SATA drive found: " + tmpDrive->getPath());
-        }
-
-        if (string(cLine).length() == 8)
-        {
-            Drive *tmpDrive = new Drive("/dev/" + string(cLine).substr(0, 7));
-            tmpDrive->state = Drive::NONE;
-            tmpDrive->bIsOffline = false;
-            plistDrives->push_back(*tmpDrive);
-            // Logger::logThis()->info("NVME drive found: " + tmpDrive->getPath());
+                    //Logger::logThis()->info("drive found: " + tmpDrive->getPath());
                }
        }
    pclose(outputfileHwinfo);
@ -344,35 +324,15 @@ void reHDD::searchDrives(list<Drive> *plistDrives)
 */
 void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
 {
-    string systemDrivePath;
-    if (getSystemDrive(systemDrivePath))
-    {
-        // Logger::logThis()->info("Found system drive: " + systemDrivePath);
-
-        list<Drive>::iterator it;
-        for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-        {
-            if (it->getPath().find(systemDrivePath) != std::string::npos) // compare found system drive and current drive
-            {
-                // system drive found --> ignore this drive
-#ifdef LOG_LEVEL_HIGH
-                Logger::logThis()->info("system drive found --> ignore this drive: " + it->getPath());
-#endif
-                it = plistDrives->erase(it);
-                it--;
-            }
-        }
-    }
-
-    list<tuple<string>> vtlIgnoredDevices; // store drives from ignore file
-    ifstream input("ignoreDrives.conf");   // read ignore file
+    list<tuple<string>> vtlIgnoredDevices; //store drives from ingnore file
+    ifstream input( "ignoreDrives.conf" ); //read ingnore file

    for(string sLine; getline( input, sLine );)
        {
-        // Logger::logThis()->info("read uuid: " + sLine);
+            Logger::logThis()->info("read uuid: " + sLine);
            vtlIgnoredDevices.emplace_back(sLine); //add found path and uuid from ignore file to vector
        }
-    // loop through found entries in ignore file
+    //loop through found entries in ingnore file
    for(auto row : vtlIgnoredDevices)
        {
            list <Drive>::iterator it;
@ -417,53 +377,6 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
        }
 }

-/**
- * \brief   filter out drives that are not indented for processing
- * \param	pointer of list <Drive>* plistDrives
- * \return  void
- */
-void reHDD::filterInvalidDrives(list<Drive> *plistDrives)
-{
-    list<Drive>::iterator it;
-    for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-    {
-        if (it->getCapacity() == 0U)
-        {
-#ifdef LOG_LEVEL_HIGH
-            Logger::logThis()->info("Drive reports zero capacity --> ignore this drive: " + it->getPath());
-#endif
-            it = plistDrives->erase(it);
-            it--;
-        }
-    }
-}
-
-/**
- * \brief   start shred for all drives
- * \param	pointer of list <Drive>* plistDrives
- * \return  void
- */
-void reHDD::startShredAllDrives(list<Drive> *plistDrives)
-{
-    list<Drive>::iterator it;
-    mxDrives.lock();
-    for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-    {
-        if (it->state == Drive::NONE)
-        {
-            Drive *pTmpDrive = iterator_to_pointer<Drive, std::list<Drive>::iterator>(it);
-#ifdef LOG_LEVEL_HIGH
-            ostringstream address;
-            address << (void const *)&(*pTmpDrive);
-            Logger::logThis()->info("Started shred (all) for: " + pTmpDrive->getModelName() + "-" + pTmpDrive->getSerial() + " @" + address.str());
-#endif
-            pTmpDrive->state = Drive::TaskState::SHRED_ACTIVE;
-            thread(ThreadShred, pTmpDrive).detach();
-        }
-    }
-    mxDrives.unlock();
-}
-
 /**
 * \brief   print drives with all information
 * \param	pointer of list <Drive>* plistDrives
@ -499,33 +412,6 @@ void reHDD::printDrives(list<Drive> *plistDrives)
 #endif
 }

-/**
- * \brief   update shred metrics for all drives
- * \param	pointer of list <Drive>* plistDrives
- * \return  void
- */
-void reHDD::updateShredMetrics(list<Drive> *plistDrives)
-{
-    list<Drive>::iterator it;
-    for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
-    {
-        if (it->state == Drive::SHRED_ACTIVE)
-        {
-            Drive *pTmpDrive = iterator_to_pointer<Drive, std::list<Drive>::iterator>(it);
-            // set metrics for calculating shred speed
-            std::chrono::time_point<std::chrono::system_clock> chronoCurrentTimestamp = std::chrono::system_clock::now();
-            time_t u32ShredTimeDelta = (chronoCurrentTimestamp - pTmpDrive->sShredSpeed.chronoShredTimestamp).count();
-            if (u32ShredTimeDelta > METRIC_THRESHOLD)
-            {
-                pTmpDrive->sShredSpeed.u32ShredTimeDelta = u32ShredTimeDelta;
-                pTmpDrive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();
-                pTmpDrive->sShredSpeed.ulWrittenBytes = pTmpDrive->sShredSpeed.ulSpeedMetricBytesWritten;
-                pTmpDrive->sShredSpeed.ulSpeedMetricBytesWritten = 0U;
-            }
-        }
-    }
-}
-
 /**
 * \brief   add S.M.A.R.T data from SMART
 * \param	pointer of list <Drive>* plistDrives
@ -568,28 +454,26 @@ void reHDD::handleArrowKey(TUI::UserInput userInput)
            break;
        }

-    // Logger::logThis()->info("ArrowKey - selected drive: " + to_string(u8SelectedEntry));
+    Logger::logThis()->info("ArrowKey - selected drive: " + to_string(u8SelectedEntry));
 }

 void reHDD::handleEnter()
 {
-
    if (getSelectedDrive() != nullptr)
        {
            if(getSelectedDrive()->state == Drive::TaskState::SHRED_SELECTED)
                {
-            Logger::logThis()->info("Started shred/check for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
+                    Logger::logThis()->info("Started shred for: " + getSelectedDrive()->getModelName() + "-" +  getSelectedDrive()->getSerial());
                    getSelectedDrive()->state = Drive::TaskState::SHRED_ACTIVE;
-            // task for drive is running --> don't show  more task options
-            Drive *pTmpDrive = getSelectedDrive();
-            thread(ThreadShred, pTmpDrive).detach();
+                    //task for drive is running --> don´t show  more task options
+                    thread(ThreadShred).detach();
                }

            if(getSelectedDrive()->state == Drive::TaskState::DELETE_SELECTED)
                {
                    Logger::logThis()->info("Started delete for: " + getSelectedDrive()->getModelName() + "-" +  getSelectedDrive()->getSerial());
                    getSelectedDrive()->state = Drive::TaskState::DELETE_ACTIVE;
-            // task for drive is running --> don't show  more task options
+                    //task for drive is running --> don´t show  more task options
                    thread(ThreadDelete).detach();
                }
        }
@ -626,52 +510,5 @@ void reHDD::handleAbort()
        }
 }

-bool reHDD::getSystemDrive(string &systemDrive)
-{
-    char *cLine = NULL;
-    size_t len = 0;
-    bool systemDriveFound = false;

-    FILE *outputfileHwinfo = popen("lsblk -e 11 -o NAME,MOUNTPOINT", "r");

-    if (outputfileHwinfo == NULL)
-    {
-        Logger::logThis()->error("Unable to scan attached drives for system drive");
-        exit(EXIT_FAILURE);
-    }
-
-    while ((getline(&cLine, &len, outputfileHwinfo)) != -1)
-    {
-        string currentLine = cLine;
-
-        if (currentLine.find("NAME") != std::string::npos)
-        {
-            continue;
-        }
-
-        // Logger::logThis()->info(currentLine);
-
-        if ((cLine[0U] != '|') && (cLine[0U] != '`'))
-        {
-            systemDrive = currentLine;
-            systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), '\n'), systemDrive.end()); // remove newline
-            systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), ' '), systemDrive.end());  // remove spaces
-            // Logger::logThis()->info("Drive found: " + systemDrive);
-        }
-
-        if (currentLine.ends_with(" /boot/efi\n"s))
-        {
-            systemDriveFound = true;
-            break;
-        }
-
-        if (currentLine.ends_with(" /\n"s))
-        {
-            systemDriveFound = true;
-            break;
-        }
-    }
-    pclose(outputfileHwinfo);
-
-    return systemDriveFound;
-}
--- a/src/shred.cpp
+++ b/src/shred.cpp
@ -1,302 +0,0 @@
-/**
- * @file    shred.cpp
- * @brief   shred drive
- * @author  hendrik schutter
- * @date    22.08.2022
- */
-
-#include "../include/reHDD.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-#include "../tfnoisegen/tfprng.h"
-#ifdef __cplusplus
-}
-#endif
-
-const static char *randomsrc = (char *)"/dev/urandom";
-
-Shred::Shred()
-{
-}
-
-Shred::~Shred()
-{
-}
-
-/**
- * \brief   shred drive with shred
- * \param	pointer of Drive instance
- * \return  void
- */
-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());
-
-#ifdef DRYRUN
-    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);
-    }
-#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(randomSrcFileDiscr));
-        Logger::logThis()->error("Shred-Task: Open random source failed! " + errorMsg + " - Drive: " + drive->getSerial());
-        perror(randomsrc);
-        cleanup();
-        return -1;
-    }
-
-    // open disk
-    driveFileDiscr = open(cpDrivePath, O_RDWR | O_LARGEFILE);
-    if (driveFileDiscr == -1)
-    {
-        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(readRet));
-        Logger::logThis()->error("Shred-Task: Read random key failed! " + errorMsg + " - Drive: " + drive->getSerial());
-        perror(randomsrc);
-        cleanup();
-        return -1;
-    }
-
-    tfng_prng_seedkey(ucKey);
-
-    this->ulDriveByteSize = getDriveSizeInBytes(driveFileDiscr);
-    drive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now(); // set inital timestamp for speed metric
-    drive->sShredSpeed.ulSpeedMetricBytesWritten = 0U; // uses to calculate speed metric
-
-#ifdef LOG_LEVEL_HIGH
-    Logger::logThis()->info("Shred-Task: Bytes-Size of Drive: " + to_string(this->ulDriveByteSize) + " - Drive: " + drive->getSerial());
-#endif
-
-    for (unsigned int uiShredIterationCounter = 0U; uiShredIterationCounter < SHRED_ITERATIONS; uiShredIterationCounter++)
-    {
-        unsigned long ulDriveByteCounter = 0U; // used for one shred-iteration to keep track of the current drive position
-
-        if (uiShredIterationCounter == (SHRED_ITERATIONS - 1))
-        {
-            // last shred iteration --> overwrite (just the write chunk) bytes with zeros instead with random data
-            memset(caTfngData, 0U, CHUNK_SIZE);
-        }
-
-        while (ulDriveByteCounter < ulDriveByteSize)
-        {
-            int iBytesToShred = 0; // Bytes that will be overwritten in this chunk-iteration
-
-            if (uiShredIterationCounter != (SHRED_ITERATIONS - 1))
-            {
-                // NOT last shred iteration --> generate new random data
-                tfng_prng_genrandom(caTfngData, TFNG_DATA_SIZE);
-            }
-
-            if ((ulDriveByteSize - ulDriveByteCounter) < CHUNK_SIZE)
-            {
-                iBytesToShred = (ulDriveByteSize - ulDriveByteCounter);
-            }
-            else
-            {
-                iBytesToShred = CHUNK_SIZE;
-            }
-
-            int iByteShredded = write(driveFileDiscr, caTfngData, iBytesToShred);
-
-            if (iByteShredded <= 0)
-            {
-                std::string errorMsg(strerror(iByteShredded));
-                Logger::logThis()->error("Shred-Task: Write to drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
-                perror("unable to write random data");
-                cleanup();
-                return -1;
-            }
-
-            ulDriveByteCounter += iByteShredded;
-            ulDriveByteOverallCount += iByteShredded;
-            d32Percent = this->calcProgress();
-            drive->sShredSpeed.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;
-                // signal process in shreding
-                write(*ipSignalFd, "A", 1);
-            }
-
-            if (drive->state != Drive::SHRED_ACTIVE)
-            {
-                drive->setTaskPercentage(0);
-                d32Percent = 0.00;
-                d32TmpPercent = 0.00;
-                ulDriveByteCounter = 0U;
-                Logger::logThis()->info("Aborted shred  for: " + drive->getModelName() + "-" + drive->getSerial());
-                cleanup();
-                return -1;
-            }
-            // end one chunk write
-        }
-        if (0 != iRewindDrive(driveFileDiscr))
-        {
-            Logger::logThis()->error("Shred-Task: Unable to rewind drive! - Drive: " + drive->getSerial());
-            cleanup();
-            return -1;
-        }
-        // end one shred iteration
-    }
-    // end of all shred iteratio
-
-    tfng_prng_seedkey(NULL); // reset random generator
-
-    drive->bWasShredded = true;
-    Logger::logThis()->info("Shred-Task finished - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
-#ifdef ZERO_CHECK
-    drive->state = Drive::CHECK_ACTIVE;
-    Logger::logThis()->info("Check-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
-    drive->u32DriveChecksumAfterShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd);
-#ifdef LOG_LEVEL_HIGH
-    if (drive->u32DriveChecksumAferShredding != 0)
-    {
-        Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
-    }
-    else
-    {
-        Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
-    }
-#endif
-#endif
-#endif
-
-    cleanup();
-
-    if ((drive->state == Drive::SHRED_ACTIVE) || (drive->state == Drive::CHECK_ACTIVE))
-    {
-        drive->state = Drive::NONE;
-        drive->setTaskPercentage(0.0);
-        Printer::getPrinter()->print(drive);
-        Logger::logThis()->info("Finished shred/check for: " + drive->getModelName() + "-" + drive->getSerial());
-    }
-    return 0;
-}
-/**
- * \brief   calc shredding progress in %
- * \param	current byte index of the drive
- * \param	current shred iteration
- * \return  double percentage
- */
-double Shred::calcProgress()
-{
-    unsigned int uiMaxShredIteration = SHRED_ITERATIONS;
-
-#ifdef ZERO_CHECK
-    uiMaxShredIteration++; // increment because we will check after SHRED_ITERATIONS the drive for non-zero bytes
-#endif
-    return (double)(((double)ulDriveByteOverallCount) / ((double)this->ulDriveByteSize * uiMaxShredIteration)) * 100.0f;
-}
-
-int Shred::iRewindDrive(fileDescriptor file)
-{
-    if (0 != lseek(file, 0L, SEEK_SET))
-    {
-        perror("unable to rewind drive");
-        return -1;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-unsigned long Shred::getDriveSizeInBytes(fileDescriptor file)
-{
-    unsigned long ulDriveSizeTmp = lseek(file, 0L, SEEK_END);
-
-    if (0 != iRewindDrive(file))
-    {
-        ulDriveSizeTmp = 0U;
-    }
-
-#ifdef DEMO_DRIVE_SIZE
-    ulDriveSizeTmp = DEMO_DRIVE_SIZE;
-#endif
-    return ulDriveSizeTmp;
-}
-
-unsigned int Shred::uiCalcChecksum(fileDescriptor file, Drive *drive, int *ipSignalFd)
-{
-    unsigned int uiChecksum = 0;
-    unsigned long ulDriveByteCounter = 0U;
-    while (ulDriveByteCounter < ulDriveByteSize)
-    {
-        int iBytesToCheck = 0;
-        if ((ulDriveByteSize - ulDriveByteCounter) < CHUNK_SIZE)
-        {
-            iBytesToCheck = (ulDriveByteSize - ulDriveByteCounter);
-        }
-        else
-        {
-            iBytesToCheck = CHUNK_SIZE;
-        }
-        int iReadBytes = read(file, caReadBuffer, iBytesToCheck);
-        for (int iReadBytesCounter = 0U; iReadBytesCounter < iReadBytes; iReadBytesCounter++)
-        {
-            uiChecksum += caReadBuffer[iReadBytesCounter];
-        }
-        ulDriveByteCounter += iReadBytes;
-        ulDriveByteOverallCount += iReadBytes;
-        d32Percent = this->calcProgress();
-        drive->sShredSpeed.ulSpeedMetricBytesWritten += iReadBytes;
-
-#ifdef LOG_LEVEL_HIGH
-        Logger::logThis()->info("Shred-Task (Checksum): ByteCount: " + to_string(ulDriveByteCounter) + " - progress: " + to_string(d32Percent) + " - Drive: " + drive->getSerial());
-#endif
-
-        if (((d32Percent - d32TmpPercent) >= 0.01) || (d32Percent == 100.0))
-        {
-            drive->setTaskPercentage(d32TmpPercent);
-            d32TmpPercent = d32Percent;
-#ifdef LOG_LEVEL_HIGH
-            Logger::logThis()->info("send progress signal to main loop (check)");
-#endif
-            write(*ipSignalFd, "A", 1);
-        }
-    }
-    drive->bWasChecked = true;
-    return uiChecksum;
-}
-
-void Shred::cleanup()
-{
-    close(driveFileDiscr);
-    close(randomSrcFileDiscr);
-}
--- a/src/shred/shred.cpp
+++ b/src/shred/shred.cpp
@ -0,0 +1,447 @@
+/**
+ * @file    shred.cpp
+ * @brief   shred drive
+ * @author  hendrik schutter
+ * @date    03.05.2020
+ */
+
+#include "../../include/reHDD.h"
+#ifndef DRYRUN
+static char *randsrc = (char*) "/dev/urandom";
+static int force = 0, rmf = 0, zrf = 0, noround = 0, verbose = 0, syncio = 0, alwaysrand = 0, reqrand = 0;
+
+static char sfbuf[PATH_MAX*2];
+
+struct tfnge_stream
+{
+    TFNG_UNIT_TYPE key[TFNG_NR_KEY_UNITS];
+    TFNG_UNIT_TYPE iv[TFNG_NR_BLOCK_UNITS];
+    TFNG_BYTE_TYPE carry_block[TFNG_BLOCK_SIZE];
+    size_t carry_bytes;
+};
+
+static struct tfnge_stream tfnge;
+#endif
+
+Shred::Shred()
+{
+
+}
+
+
+Shred::~Shred()
+{
+
+}
+
+
+
+/**
+ * \brief   shred drive with shred
+ * \param	pointer of Drive instance
+ * \return  void
+ */
+void Shred::shredDrive(Drive* drive, int* ipSignalFd)
+{
+
+#ifdef DRYRUN
+    for(int i = 0; i<=500; i++)
+        {
+            if(drive->state != Drive::SHRED_ACTIVE)
+                {
+                    return;
+                }
+            drive->setTaskPercentage(i+0.05);
+            write(*ipSignalFd, "A",1);
+            usleep(20000);
+        }
+#endif
+
+#ifndef DRYRUN
+
+    struct stat st;
+    char *bufRandomData, *s, *d, rc = 0;
+    int filehandleDrive, filehandleRandom;
+    int xret = 0, pat = 0, last = 0, special = 0, iIteration = 0;
+    size_t blksz = 0, x, y;
+    size_t l, ll = NOSIZE;
+
+    const char *cpDrivePath = drive->getPath().c_str();
+
+    blockcount_max = SHRED_ITERATIONS*(drive->getCapacity()/4096);
+
+    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: Max-BlockCount: " + to_string(blockcount_max) + " - Drive: " + drive->getSerial());
+#endif
+
+    d32Percent = 0U;
+
+    filehandleRandom = open(randsrc, O_RDONLY | O_LARGEFILE);
+    if (filehandleRandom == -1)
+        {
+            perror(randsrc);
+            exit(1);
+        }
+
+    special = pat = 0;
+    iIteration = SHRED_ITERATIONS;
+    if (verbose)
+        {
+            fprintf(stderr, "destroying %s ...\n", cpDrivePath);
+        }
+
+    if (stat(cpDrivePath, &st) == -1)
+        {
+            perror(cpDrivePath);
+            XRET(1);
+            goto _return;
+        }
+    if (!blksz)
+        {
+            blksz = (size_t)st.st_blksize;
+            Logger::logThis()->info("Optimal block size for I/O: " + to_string(blksz));
+        }
+
+    else
+        {
+            l = ll = st.st_size;
+        }
+    if (l == 0 && !S_ISREG(st.st_mode))
+        {
+            special = 1;
+        }
+    memset(&st, 0, sizeof(struct stat));
+
+    if (force) if (chmod(cpDrivePath, S_IRUSR|S_IWUSR) == -1)
+            {
+                perror(cpDrivePath);
+                XRET(1);
+            }
+    filehandleDrive = open(cpDrivePath, O_WRONLY | O_LARGEFILE | O_NOCTTY | syncio);
+    if (filehandleDrive == -1)
+        {
+            XRET(1);
+            perror(cpDrivePath);
+            goto _return;
+        }
+
+    bufRandomData = (char*) malloc(blksz);
+    if (!bufRandomData)
+        {
+            perror("malloc");
+            XRET(2);
+            fprintf(stderr, "Continuing with fixed buffer (%zu bytes long)\n", sizeof(sfbuf));
+            bufRandomData = sfbuf;
+            blksz = sizeof(sfbuf);
+        }
+    memset(bufRandomData, 0, blksz);
+
+    if (read(filehandleRandom, bufRandomData, blksz) <= 0) fprintf(stderr, "%s: read 0 bytes (wanted %zu)\n", randsrc, blksz);
+    tfnge_init(&tfnge, bufRandomData);
+
+    //iteration loop
+    while (iIteration)
+        {
+            lseek(filehandleDrive, 0L, SEEK_SET);
+
+            if (iIteration <= 1 && zrf)
+                {
+                    Logger::logThis()->info("pat=1");
+                    pat = 1;
+                    rc = 0;
+                }
+            else if (iIteration == SHRED_ITERATIONS && reqrand)
+                {
+                    pat = 0;
+                }
+            else if (!alwaysrand)
+                {
+                    if (read(filehandleRandom, &rc, 1) <= 0) fprintf(stderr, "%s: read 0 bytes (wanted 1)\n", randsrc);
+                    pat = rc%2;
+                    if (read(filehandleRandom, &rc, 1) <= 0) fprintf(stderr, "%s: read 0 bytes (wanted 1)\n", randsrc);
+
+                }
+            else pat = 0;
+
+            if (verbose)
+                {
+                    if (pat) fprintf(stderr, "iteration (pat) %d (%02hhx%02hhx%02hhx) ...\n", SHRED_ITERATIONS-iIteration+1, rc, rc, rc);
+                    else fprintf(stderr, "iteration (!pat)  %d (random) ...\n", SHRED_ITERATIONS-iIteration+1);
+                }
+            // write block loop
+            while (1)
+                {
+                    if(drive->state != Drive::SHRED_ACTIVE)
+                        {
+                            drive->setTaskPercentage(0);
+                            d32Percent = 0.00;
+                            blockcount = 0;
+                            blockcount_max = 0;
+                            Logger::logThis()->info("Aborted shred  for: " + drive->getModelName() + "-" +  drive->getSerial());
+                            goto _return;
+                        }
+
+                    double d32TmpPercent = calcProgress();
+
+
+
+                    if((d32TmpPercent-d32Percent) >= 0.09)
+                        {
+                            drive->setTaskPercentage(d32TmpPercent);
+                            d32Percent = d32TmpPercent;
+#ifdef LOG_LEVEL_HIGH
+                            Logger::logThis()->info("Shred-Task: BlockCount: " + to_string(blockcount) + " - progress: " + to_string(d32Percent) + " - Drive: " + drive->getSerial());
+#endif
+
+                            //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;
+
+                            write(*ipSignalFd, "A",1);
+                        }
+
+                    if (!pat)
+                        {
+                            // Logger::logThis()->info("tfnge_emit");
+                            //tfnge_emit(bufRandomData, blksz, &tfnge);
+                        }
+                    else
+                        {
+                            memset(bufRandomData, rc, blksz);
+                        }
+
+                    if (l <= blksz && !special)
+                        {
+                            last = 1;
+                        }
+                    errno = 0;
+
+                    printRandomBufferChecksum(bufRandomData, (noround && last) ? l : blksz);
+
+                    size_t write_return = write(filehandleDrive, bufRandomData, (noround && last) ? l : blksz);
+                    ulSpeedMetricBytesWritten += write_return;
+                    l -= write_return;
+                    if (errno)
+                        {
+                            perror(cpDrivePath);
+                            errno = 0;
+                            break;
+                        }
+
+                    if (last)
+                        {
+                            last = 0;
+                            break;
+                        }
+                }
+            // write block loop end
+            l = ll;
+            fdatasync(filehandleDrive);
+            iIteration--;
+        } //iteration loop end
+
+    if (rmf)
+        {
+            close(filehandleDrive);
+            filehandleDrive = open(cpDrivePath, O_WRONLY | O_TRUNC | O_LARGEFILE | O_NOCTTY | syncio);
+            if (verbose) fprintf(stderr, "removing %s ...\n", cpDrivePath);
+            x = strnlen(cpDrivePath, sizeof(sfbuf)/2);
+            s = sfbuf+(sizeof(sfbuf)/2);
+            memcpy(sfbuf, cpDrivePath, x);
+            *(sfbuf+x) = 0;
+            d = strrchr(sfbuf, '/');
+            if (d)
+                {
+                    d++;
+                    y = d-sfbuf;
+                    memset(d, '0', x-(d-sfbuf));
+                }
+            else
+                {
+                    y = 0;
+                    memset(sfbuf, '0', x);
+                }
+            memcpy(s, sfbuf, x);
+            *(s+x) = 0;
+
+            /* Somehow I need to rename original to destination */
+            if (access(s, R_OK) != -1)
+                {
+                    fprintf(stderr, "%s already exists!\n", s);
+                    unlink(cpDrivePath);
+                    goto _return;
+                }
+            if (verbose) fprintf(stderr, "%s -> %s\n", cpDrivePath, s);
+            if (rename(cpDrivePath, s) == -1)
+                {
+                    perror(s);
+                    goto _return;
+                }
+
+            while (x > y+1)
+                {
+                    *(sfbuf+x) = 0;
+                    x--;
+                    *(s+x) = 0;
+                    if (access(s, R_OK) != -1)
+                        {
+                            fprintf(stderr, "%s already exists!\n", s);
+                            unlink(sfbuf);
+                            goto _return;
+                        }
+                    if (verbose) fprintf(stderr, "%s -> %s\n", sfbuf, s);
+                    if (rename(sfbuf, s) == -1)
+                        {
+                            perror(s);
+                            goto _return;
+                        }
+                }
+
+            if (verbose) fprintf(stderr, "remove %s\n", s);
+            unlink(s);
+            if (verbose) fprintf(stderr, "done away with %s.\n", cpDrivePath);
+        }
+
+    tfnge_emit(NULL, 0, &tfnge);
+    if (bufRandomData && bufRandomData != sfbuf) free(bufRandomData);
+    if (filehandleDrive != -1) close(filehandleDrive);
+
+_return:
+    optind++;
+    close(filehandleRandom);
+#endif
+    if(drive->state == Drive::SHRED_ACTIVE)
+        {
+            drive->bWasShredded = true;
+            drive->state= Drive::NONE;
+            drive->setTaskPercentage(0);
+            Logger::logThis()->info("Finished shred for: " + drive->getModelName() + "-" +  drive->getSerial());
+        }
+}
+#ifndef DRYRUN
+
+double Shred::calcProgress()
+{
+    blockcount++;
+    return ((((double)blockcount/(double)blockcount_max))*100);
+}
+
+void Shred::printRandomBufferChecksum(char* buf, size_t szdst)
+{
+    uint8_t u8Checksum = 0U;
+    for (size_t i = 0; i < szdst; i++)
+        {
+            u8Checksum += buf[i];
+        }
+    Logger::logThis()->info("random: " + to_string(u8Checksum));
+}
+
+
+void Shred::tfnge_init_iv(struct tfnge_stream *tfe, const void *key, const void *iv)
+{
+    memset(tfe, 0, sizeof(struct tfnge_stream));
+    memcpy(tfe->key, key, TFNG_KEY_SIZE);
+    if (iv) memcpy(tfe->iv, iv, TFNG_BLOCK_SIZE);
+    tfe->carry_bytes = 0;
+}
+
+void Shred::tfnge_init(struct tfnge_stream *tfe, const void *key)
+{
+    tfnge_init_iv(tfe, key, NULL);
+}
+
+void Shred::tfng_encrypt_rawblk(TFNG_UNIT_TYPE *O, const TFNG_UNIT_TYPE *I, const TFNG_UNIT_TYPE *K)
+{
+    TFNG_UNIT_TYPE X, Y, Z, T;
+    TFNG_UNIT_TYPE K0, K1, K2, K3;
+    TFNG_UNIT_TYPE K4, T0, T1, T2;
+
+    X = I[0];
+    Y = I[1];
+    Z = I[2];
+    T = I[3];
+
+    K0 = K[0];
+    K1 = K[1];
+    K2 = K[2];
+    K3 = K[3];
+    K4 = K[4];
+    T0 = K[5];
+    T1 = K[6];
+    T2 = K[7];
+
+    PROCESS_BLOCKP( 1,K1,T0,K0,K3,K2,T1);
+    PROCESS_BLOCKN( 2,K2,T1,K1,K4,K3,T2);
+    PROCESS_BLOCKP( 3,K3,T2,K2,K0,K4,T0);
+    PROCESS_BLOCKN( 4,K4,T0,K3,K1,K0,T1);
+
+    PROCESS_BLOCKP( 5,K0,T1,K4,K2,K1,T2);
+    PROCESS_BLOCKN( 6,K1,T2,K0,K3,K2,T0);
+    PROCESS_BLOCKP( 7,K2,T0,K1,K4,K3,T1);
+    PROCESS_BLOCKN( 8,K3,T1,K2,K0,K4,T2);
+
+    PROCESS_BLOCKP( 9,K4,T2,K3,K1,K0,T0);
+    PROCESS_BLOCKN(10,K0,T0,K4,K2,K1,T1);
+    PROCESS_BLOCKP(11,K1,T1,K0,K3,K2,T2);
+    PROCESS_BLOCKN(12,K2,T2,K1,K4,K3,T0);
+
+    O[0] = X + K3;
+    O[1] = Y + K4 + T0;
+    O[2] = Z + K0 + T1;
+    O[3] = T + K1 + 18;
+}
+
+void Shred::tfnge_emit(void *dst, size_t szdst, struct tfnge_stream *tfe)
+{
+    TFNG_BYTE_TYPE *udst = (uint8_t*) dst;
+    size_t sz = szdst;
+
+    if (!dst && szdst == 0)
+        {
+            memset(tfe, 0, sizeof(struct tfnge_stream));
+            return;
+        }
+
+    if (tfe->carry_bytes > 0)
+        {
+            if (tfe->carry_bytes > szdst)
+                {
+                    memcpy(udst, tfe->carry_block, szdst);
+                    memmove(tfe->carry_block, tfe->carry_block+szdst, tfe->carry_bytes-szdst);
+                    tfe->carry_bytes -= szdst;
+                    return;
+                }
+
+            memcpy(udst, tfe->carry_block, tfe->carry_bytes);
+            udst += tfe->carry_bytes;
+            sz -= tfe->carry_bytes;
+            tfe->carry_bytes = 0;
+        }
+
+    if (sz >= TFNG_BLOCK_SIZE)
+        {
+            do
+                {
+                    tfng_encrypt_rawblk(tfe->iv, tfe->iv, tfe->key);
+                    memcpy(udst, tfe->iv, TFNG_BLOCK_SIZE);
+                    udst += TFNG_BLOCK_SIZE;
+                }
+            while ((sz -= TFNG_BLOCK_SIZE) >= TFNG_BLOCK_SIZE);
+        }
+
+    if (sz)
+        {
+            tfng_encrypt_rawblk(tfe->iv, tfe->iv, tfe->key);
+            memcpy(udst, tfe->iv, sz);
+            udst = (TFNG_BYTE_TYPE *)tfe->iv;
+            tfe->carry_bytes = TFNG_BLOCK_SIZE-sz;
+            memcpy(tfe->carry_block, udst+sz, tfe->carry_bytes);
+        }
+}
+#endif
--- a/src/smart.cpp
+++ b/src/smart.cpp
@ -7,6 +7,14 @@

 #include "../include/reHDD.h"

+string SMART::modelFamily;
+string SMART::modelName;
+string SMART::serial;
+uint64_t SMART::capacity = 0U;
+uint32_t SMART::errorCount = 0U;
+uint32_t SMART::powerOnHours = 0U;
+uint32_t SMART::powerCycle = 0U;
+
 /**
 * \brief   get and set S.M.A.R.T. values in Drive
 * \param	pointer of Drive instance
@ -14,138 +22,79 @@
 */
 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);
        }
-
    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);
-        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);
-        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);
@ -154,21 +103,15 @@ bool SMART::parseSerial(string sLine, string &serial)
            sLine.erase(0, sLine.find(": ") + 3);
            sLine.erase(sLine.length()-3, 3);
            serial = sLine;
-        return true;
-    }
-    else
-    {
-        return false;
        }
 }

 /**
 * \brief   parse Capacity
 * \param	string output line of smartctl
- *  \param string parsed capacity
- * \return 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);
@ -177,67 +120,50 @@ bool SMART::parseCapacity(string sLine, uint64_t &capacity)
            sLine.erase(0, sLine.find(": ") + 2);
            sLine.erase(sLine.length()-1, 1);
            capacity = stol(sLine);
-        return true;
-    }
-    else
-    {
-        return false;
        }
 }

 /**
 * \brief   parse ErrorCount
 * \param	string output line of smartctl
- * \param uint32_t parsed error count
- * \return 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);
-        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);
-        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);
@ -245,41 +171,8 @@ bool SMART::parsePowerCycles(string sLine, uint32_t &powerCycles)
        {
            sLine.erase(0, sLine.find(": ") + 2);
            sLine.erase(sLine.length()-2, 2);
-        powerCycles = stol(sLine);
-        return true;
-    }
-    else
-    {
-        return false;
+            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);
-        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;
-    }
-}
--- a/src/tui.cpp
+++ b/src/tui.cpp
@ -41,23 +41,12 @@ void TUI::initTUI()
    init_pair(COLOR_AREA_STDSCR,COLOR_WHITE, COLOR_BLUE);
    wbkgd(stdscr, COLOR_PAIR(COLOR_AREA_STDSCR));

-    init_pair(COLOR_AREA_ENTRY_EVEN, COLOR_BLACK, COLOR_WHITE);
-    init_pair(COLOR_AREA_ENTRY_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");
 }

@ -72,12 +61,10 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)

    refresh();

-    // overview window is 3/7 of the x-size
-    overview = createOverViewWindow((int)(u16StdscrX * (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);
@ -87,12 +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 sSpeed = " ";

            bool bSelectedEntry = false;

@ -101,30 +87,24 @@ 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::SHRED_ACTIVE:

-            stream << fixed << setprecision(3) << (it->getTaskPercentage());
+                    stream << fixed << setprecision(2) << (it->getTaskPercentage());
                    sState = "Shredding: " + stream.str() + "%";

-            it->calculateTaskDuration();
-            sTime = this->formatTimeDuration(it->getTaskDuration());
-            sSpeed = this->formatSpeed(it->sShredSpeed.u32ShredTimeDelta, it->sShredSpeed.ulWrittenBytes);
-            break;
-        case Drive::CHECK_ACTIVE:
-            stream << fixed << setprecision(3) << (it->getTaskPercentage());
-            sState = "Checking: " + stream.str() + "%";
                    it->calculateTaskDuration();
                    sTime = this->formatTimeDuration(it->getTaskDuration());
                    sSpeed = this->formatSpeed(it->sShredSpeed.u32ShredTimeDelta, it->sShredSpeed.ulWrittenBytes);
@ -134,39 +114,22 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
                    it->calculateTaskDuration();
                    sTime = this->formatTimeDuration(it->getTaskDuration());
                    break;
+
                case Drive::NONE:
                case Drive::SHRED_SELECTED:
                case Drive::DELETE_SELECTED:
-            if (it->bWasDeleted)
+                    if (it->bWasDeleteted)
                        {
                            sState = "DELETED"; //mark drive as deleted previously
                        }
                    if (it->bWasShredded)
                        {
-                if (it->bWasChecked)
-                {
-                    // 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))
-            {
-                dialog = createZeroChecksumWarning(70, 16, ((u16StdscrX) - (int)(u16StdscrX / 2) - 20), (int)(u16StdscrY / 2) - 8, it->getPath(), it->getModelFamily(), it->getModelName(), it->getSerial(), it->u32DriveChecksumAfterShredding);
-                wrefresh(dialog);
-            }
-#endif
-
                    break;
                case Drive::FROZEN:
-            stream << fixed << setprecision(3) << (it->getTaskPercentage());
+                    stream << fixed << setprecision(2) << (it->getTaskPercentage());
 #ifdef FROZEN_ALERT
                    if(bSelectedEntry)
                        {
@ -180,9 +143,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, 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
@ -198,11 +159,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();
@ -234,9 +195,6 @@ enum TUI::UserInput TUI::readUserInput()
        case 's':
            return TUI::UserInput::Shred;
            break;
-    case 'S':
-        return TUI::UserInput::ShredAll;
-        break;
        default:
            return TUI::UserInput::Undefined;
            break;
@ -257,13 +215,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);
@ -276,7 +231,7 @@ WINDOW *TUI::createOverViewWindow(int iXSize, int iYSize)
 WINDOW* TUI::createDetailViewWindow( int iXSize, int iYSize, int iXStart, Drive drive)
 {
    WINDOW *newWindow;
-    newWindow = newwin(iYSize, iXSize, 1, iXStart);
+    newWindow = newwin(iYSize, iXSize, 2, iXStart);
    wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_DETAIL));
    box(newWindow, ACS_VLINE, ACS_HLINE);

@ -284,7 +239,7 @@ WINDOW *TUI::createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive d
    centerTitle(newWindow, title.c_str());

    string sPath =  "Path:          " +drive.getPath();
-    string sModelFamily = "ModelFamily:   " + drive.getModelFamily();
+    string sModelFamlily = "ModelFamily:   " + drive.getModelFamily();
    string sModelName =  "ModelName:     " + drive.getModelName();
    string sCapacity =  "Capacity:      " + drive.sCapacityToText();
    string sSerial =  "Serial:        " + drive.getSerial();
@ -295,7 +250,7 @@ WINDOW *TUI::createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive d
    uint16_t u16Line = 2;

    mvwaddstr(newWindow,u16Line++, 3, sPath.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sModelFamily.c_str());
+    mvwaddstr(newWindow,u16Line++, 3, sModelFamlily.c_str());
    mvwaddstr(newWindow,u16Line++, 3, sModelName.c_str());
    mvwaddstr(newWindow,u16Line++, 3, sCapacity.c_str());
    mvwaddstr(newWindow,u16Line++, 3, sSerial.c_str());
@ -312,7 +267,7 @@ WINDOW *TUI::createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive d
 WINDOW* TUI::overwriteDetailViewWindow( int iXSize, int iYSize, int iXStart)
 {
    WINDOW *newWindow;
-    newWindow = newwin(iYSize, iXSize, 1, iXStart);
+    newWindow = newwin(iYSize, iXSize, 2, iXStart);
    wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_DETAIL));
    box(newWindow, ACS_VLINE, ACS_HLINE);

@ -324,7 +279,7 @@ WINDOW *TUI::overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart)
    string sLine03 =  "Available under GPL 3.0";
    string sLine04 =  "https://git.mosad.xyz/localhorst/reHDD";
    string sLine05 =  "Delete: Wipe format table - this is NOT secure";
-    string sLine06 = "Shred: Overwrite drive " + to_string(SHRED_ITERATIONS) + " iterations - this is secure";
+    string sLine06 =  "Shred: Overwite drive " + to_string(SHRED_ITERATIONS) + " iterations - this is secure";

    uint16_t u16Line = 5;

@ -342,7 +297,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, 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);
@ -350,65 +305,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
-
-    line:02
-        0-2:    space
-        3-31:   Serial
-        32:     space
-        33-45:  Speed
-        46:     space
-        47-58:  Time
-        59:     space
-        60-70:  State (but right side aligned)
-    */
-
-    vTruncateText(&sModelFamily, 32);
-    mvwaddstr(newWindow, 0, 3, sModelFamily.c_str());
-    mvwaddstr(newWindow, 0, 37, sCapacity.c_str());
-    mvwaddstr(newWindow, 0, 47, sTemp.c_str());
-
-    vTruncateText(&sSerial, 28);
-    mvwaddstr(newWindow, 1, 3, sSerial.c_str());
-    mvwaddstr(newWindow, 1, 33, sSpeed.c_str());
-    mvwaddstr(newWindow, 1, 47, sTime.c_str());
-    mvwaddstr(newWindow, 1, iXSize - sState.length() - 2, sState.c_str());
+    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;
 }
@ -433,21 +348,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 = "Available under 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());

@ -464,23 +373,23 @@ WINDOW *TUI::createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, st

    centerTitle(newWindow, "Controls");

-    uint16_t u16Line = 4;
+    uint16_t u16Line = 2;

    if(menustate.bAbort)
        {
-        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());
        }

@ -541,42 +450,6 @@ WINDOW *TUI::createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStar
    return newWindow;
 }

-WINDOW *TUI::createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, uint32_t u32Checksum)
-{
-    WINDOW *newWindow;
-    newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
-
-    wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_ENTRY_SELECTED));
-    box(newWindow, ACS_VLINE, ACS_HLINE);
-
-    string sHeader = "Drive " + sPath + " is NOT successfully shredded!";
-    string sLine01 = "Please detach this drive and check it manually:";
-    string sShredChecksum = "After shredding the checksum was: " + to_string(u32Checksum);
-    string sLinePath = "Path:          " + sPath;
-    string sLineModelFamily = "ModelFamily:   " + sModelFamily;
-    string sLineModelName = "ModelName:     " + sModelName;
-    string sLineSerial = "Serial:        " + sSerial;
-
-    string sLine02 = "reHDD was not able to write zero into every byte on the drive.";
-    string sLine03 = "This can be caused by an malfunctioning drive.";
-
-    centerTitle(newWindow, sHeader.c_str());
-
-    uint16_t u16Line = 2;
-    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, sLineModelName.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sLineSerial.c_str());
-    u16Line++;
-    mvwaddstr(newWindow, u16Line++, 3, sLine02.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sLine03.c_str());
-    mvwaddstr(newWindow, u16Line++, 3, sShredChecksum.c_str());
-
-    return newWindow;
-}
-
 string TUI::formatTimeDuration(time_t u32Duration)
 {
    std::ostringstream out;
@ -601,15 +474,6 @@ string TUI::formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes)
    return out.str();
 }

-void TUI::vTruncateText(string *psText, uint16_t u16MaxLenght)
-{
-    if (psText->length() > u16MaxLenght)
-    {
-        psText->resize(u16MaxLenght - 3);
-        *psText = *psText + "...";
-    }
-}
-
 void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
 {
    struct MenuState menustate;
@ -634,10 +498,6 @@ void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
            menustate.bAbort = true;
            break;

-    case Drive::CHECK_ACTIVE: // check task running for this drive
-        menustate.bAbort = true;
-        break;
-
        case Drive::DELETE_SELECTED : //delete task selected for this drive
            menustate.bConfirmDelete = true;
            break;
@ -649,10 +509,10 @@ void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
            break;
        }

-    detailview = createDetailViewWindow((stdscrX) - ((int)(stdscrX * (float)(3.0 / 7.0))) - 7, (stdscrY - 15), (int)(stdscrX * (float)(3.0 / 7.0) + 5), drive);
+    detailview=createDetailViewWindow(((stdscrX)-(int)(stdscrX/3)-7), (stdscrY-15), (int)(stdscrX/3)+5, drive);
    wrefresh(detailview);

-    menuview = createMenuView(((int)(stdscrX * (float)(2.0 / 7.0))) - 3, 12, (int)(stdscrX * (float)(3.0 / 7.0) + 5), (stdscrY - 13), menustate);
+    menuview=createMenuView(((int)(stdscrX/3)-10 ), 10, (int)(stdscrX/3)+5,(stdscrY-11), menustate);
    wrefresh(menuview);

    if(menustate.bConfirmShred == true)
@ -671,7 +531,7 @@ void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
        }
 }

-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);
@ -704,14 +564,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;
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 488716ef22ac5a1aae235a59bea2997ac7e8e45a
Author	SHA1	Message	Date
Hendrik Schutter	8e15a537cf	comments for better understanding	2022-08-22 09:47:06 +02:00
Hendrik Schutter	0d72829f61	display shred speed	2022-06-30 09:38:11 +02:00
				`@ -1 +0,0 @@`
				`Subproject commit 488716ef22ac5a1aae235a59bea2997ac7e8e45a`