Skip to content

Commit f555f11

Browse files
committed
2 parents f947b51 + 8925a9e commit f555f11

1 file changed

Lines changed: 6 additions & 10 deletions

File tree

src/util.cpp

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -609,16 +609,12 @@ std::string Util::getLocalFileHash(const std::string& xml_dir, const std::string
609609

610610
void Util::shortenStringToTerminalWidth(std::string& str)
611611
{
612-
int iStrLen = static_cast<int>(str.length());
613-
int iTermWidth = Util::getTerminalWidth();
614-
if (iStrLen >= iTermWidth)
615-
{
616-
size_t chars_to_remove = (iStrLen - iTermWidth) + 4;
617-
size_t middle = iStrLen / 2;
618-
size_t pos1 = middle - (chars_to_remove / 2);
619-
size_t pos2 = middle + (chars_to_remove / 2);
620-
str.replace(str.begin()+pos1, str.begin()+pos2, "...");
621-
}
612+
const size_t iTermWidth = Util::getTerminalWidth();
613+
if (str.size() <= iTermWidth || iTermWidth < 4)
614+
return;
615+
616+
const size_t iCharsToKeep = (iTermWidth - 3) / 2;
617+
str = str.substr(0, iCharsToKeep) + "..." + str.substr(str.size() - iCharsToKeep);
622618
}
623619

624620
std::string Util::getJsonUIntValueAsString(const Json::Value& json_value)

0 commit comments

Comments
 (0)