diff --git a/conversion/stringconversion.cpp b/conversion/stringconversion.cpp index 71d6258..cedf330 100644 --- a/conversion/stringconversion.cpp +++ b/conversion/stringconversion.cpp @@ -25,7 +25,7 @@ void truncateString(string &str, char terminationChar) * * The unit with appropriate binary prefix will be appended. */ -string dataSizeToString(uint64 sizeInByte) +string dataSizeToString(uint64 sizeInByte, bool includeByte) { stringstream res(stringstream::in | stringstream::out); res.setf(ios::fixed, ios::floatfield); @@ -41,6 +41,9 @@ string dataSizeToString(uint64 sizeInByte) } else { res << (static_cast(sizeInByte) / 1099511627776.0) << " TiB"; } + if(includeByte && sizeInByte > 1024LL) { + res << ' ' << '(' << sizeInByte << " byte)"; + } return res.str(); } diff --git a/conversion/stringconversion.h b/conversion/stringconversion.h index 5fcb628..4f76c5d 100644 --- a/conversion/stringconversion.h +++ b/conversion/stringconversion.h @@ -194,7 +194,7 @@ template LIB_EXPORT std::string interpretIntegerAsString(T integer, return std::string(buffer + startOffset, sizeof(T) - startOffset); } -LIB_EXPORT std::string dataSizeToString(uint64 sizeInByte); +LIB_EXPORT std::string dataSizeToString(uint64 sizeInByte, bool includeByte = false); LIB_EXPORT std::string bitrateToString(double speedInKbitsPerSecond, bool useByteInsteadOfBits = false); LIB_EXPORT std::string encodeBase64(const std::vector &bytes); LIB_EXPORT std::vector decodeBase64(const std::string &encoded);