diff options
Diffstat (limited to 'lib/common/Utils.cpp')
-rw-r--r-- | lib/common/Utils.cpp | 63 |
1 files changed, 2 insertions, 61 deletions
diff --git a/lib/common/Utils.cpp b/lib/common/Utils.cpp index 90421299..83a12ccf 100644 --- a/lib/common/Utils.cpp +++ b/lib/common/Utils.cpp @@ -53,10 +53,10 @@ void SplitString(const std::string &String, char SplitOn, std::vector<std::strin rOutput.push_back(String.substr(b)); } /*#ifndef NDEBUG - BOX_TRACE("Splitting string '" << String << " on " << (char)SplitOn); + TRACE2("Splitting string '%s' on %c\n", String.c_str(), SplitOn); for(unsigned int l = 0; l < rOutput.size(); ++l) { - BOX_TRACE(l << " = '" << rOutput[l] << "'"); + TRACE2("%d = '%s'\n", l, rOutput[l].c_str()); } #endif*/ } @@ -159,65 +159,6 @@ int ObjectExists(const std::string& rFilename) return ((st.st_mode & S_IFDIR) == 0)?ObjectExists_File:ObjectExists_Dir; } -std::string HumanReadableSize(int64_t Bytes) -{ - double readableValue = Bytes; - std::string units = " B"; - if (readableValue > 1024) - { - readableValue /= 1024; - units = "kB"; - } - - if (readableValue > 1024) - { - readableValue /= 1024; - units = "MB"; - } - - if (readableValue > 1024) - { - readableValue /= 1024; - units = "GB"; - } - - std::ostringstream result; - result << std::fixed << std::setprecision(2) << readableValue << - " " << units; - return result.str(); -} -std::string FormatUsageBar(int64_t Blocks, int64_t Bytes, int64_t Max) -{ - std::ostringstream result; - - // Bar graph - char bar[17]; - unsigned int b = (int)((Bytes * (sizeof(bar)-1)) / Max); - if(b > sizeof(bar)-1) {b = sizeof(bar)-1;} - for(unsigned int l = 0; l < b; l++) - { - bar[l] = '*'; - } - for(unsigned int l = b; l < sizeof(bar) - 1; l++) - { - bar[l] = ' '; - } - bar[sizeof(bar)-1] = '\0'; - - result << std::fixed << - std::setw(10) << Blocks << " blocks, " << - std::setw(10) << HumanReadableSize(Bytes) << ", " << - std::setw(3) << std::setprecision(0) << - ((Bytes*100)/Max) << "% |" << bar << "|"; - - return result.str(); -} -std::string FormatUsageLineStart(const std::string& rName) -{ - std::ostringstream result; - result << std::setw(20) << std::right << rName << ": "; - return result.str(); -} |