TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-10 04:50:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve path truncation

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2023-08-19 23:55:42 +02:00
parent 94c377379b
commit 992d4cd51e
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/dwarfs/util.cpp
View File

@ -148,6 +148,24 @@ size_t utf8_display_width(std::string const& str) {
return utf8_display_width(str.data(), str.size()); return utf8_display_width(str.data(), str.size());
} }
void utf8_truncate(std::string& str, size_t len) {
char const* p = str.data();
char const* const e = p + str.size();
size_t l = 0;
while (p < e && l < len) {
auto np = p;
auto cp = utf8::next(np, e);
l += dwarfs_wcwidth(cp);
if (l > len) {
break;
}
p = np;
}
str.resize(p - str.data());
}
void shorten_path_string(std::string& path, char separator, size_t max_len) { void shorten_path_string(std::string& path, char separator, size_t max_len) {
auto len = utf8_display_width(path); auto len = utf8_display_width(path);
@ -158,19 +176,26 @@ void shorten_path_string(std::string& path, char separator, size_t max_len) {
} }
size_t start = 0; size_t start = 0;
max_len -= 3;
while (start != std::string::npos && while (utf8_display_width(path.data() + start, path.size() - start) >
utf8_display_width(path.data() + start, path.size() - start) > max_len - 3) {
max_len) { auto next = path.find(separator, start + 1);
start = path.find(separator, start + 1); if (next == std::string::npos) {
break;
} }
start = next;
if (start == std::string::npos) {
start = max_len - len;
} }
path.replace(0, start, "..."); path.replace(0, start, "...");
if (auto len = utf8_display_width(path); len > max_len) {
if (max_len >= 7) {
utf8_truncate(path, max_len - 3);
path += "...";
} else {
path = "...";
}
}
} }
} }

2
test/utils_test.cpp
View File

@ -94,7 +94,7 @@ TEST(shorten_path, string_ascii) {
for (size_t max_len = 0; max_len < expected.size(); ++max_len) { for (size_t max_len = 0; max_len < expected.size(); ++max_len) {
std::string path = "/aa/bb/cc/dd/ee"; std::string path = "/aa/bb/cc/dd/ee";
shorten_path_string(path, '/', max_len); shorten_path_string(path, '/', max_len);
EXPECT_EQ(expected[max_len], path); EXPECT_EQ(expected[max_len], path) << "[" << max_len << "]" << path;
} }
} }
} }