localhorst
/
reHDD
1
0
Fork 0
Code Issues 3 Pull Requests Releases 7 Wiki Activity

dis[play capacity as double

This commit is contained in:
Hendrik Schutter 2022-01-26 16:31:46 +01:00
parent 77c7849484
commit 84e42a430b
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/drive.cpp
View File

@ -48,17 +48,17 @@ uint32_t Drive::getPowerCycles(void)
string Drive::sCapacityToText() string Drive::sCapacityToText()
{ {
if(getCapacity() <= (999*1000000000UL)) char acBuffer[16];
{ double dSize = (double) getCapacity();
// Less or even 999 GB --> GB uint16_t u16UnitIndex = 0;
return to_string(getCapacity() / 1000000000UL) + " GB"; const char* units[] = {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
while (dSize >= 1000) { //using the marketing capacity
dSize /= 1000;
u16UnitIndex++;
} }
else
{ sprintf(acBuffer, "%.*f %s", u16UnitIndex-3, dSize, units[u16UnitIndex]);
// More 999 GB --> TB return acBuffer;
return to_string(getCapacity() / 1000000000000UL) + " TB";
}
return "ERROR";
} }
string Drive::sErrorCountToText() string Drive::sErrorCountToText()

4
src/reHDD.cpp
View File

@ -343,7 +343,7 @@ void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
sLine.erase(0, pos + sDelimiter.length()); sLine.erase(0, pos + sDelimiter.length());
sIgnoredDriveUUID = sLine; sIgnoredDriveUUID = sLine;
} //end while } //end while
vtlIgnoredDevices.emplace_back(sIgnoredDrivePath, sIgnoredDriveUUID); //add found path and uuid from ingnore file to vector vtlIgnoredDevices.emplace_back(sIgnoredDrivePath, sIgnoredDriveUUID); //add found path and uuid from ignore file to vector
} }
} }
//loop through found entries in ingnore file //loop through found entries in ingnore file
@ -383,7 +383,7 @@ void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
if (get<1>(row).compare(sUUID)) //compare uuid from ignore file and uuid from drive if (get<1>(row).compare(sUUID)) //compare uuid from ignore file and uuid from drive
{ {
cout << "[ERROR] different uuid found than in ignore file:" << it->getPath() << endl; cout << "[ERROR] different uuid found than in ignore file:" << it->getPath() << endl;
Logger::logThis()->error("[ERROR] different uuid found than in ignore file: " + it->getPath()); Logger::logThis()->error("[ERROR] different uuid found than in ignore file: " + it->getPath() + " uuid from drive: " + sUUID);
exit(EXIT_FAILURE); // exit to prevent accidentally shred a system drive exit(EXIT_FAILURE); // exit to prevent accidentally shred a system drive
} }
else else