vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2025-12-07 09:36:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Replaced '...' with '…' in texts

Browse Source
This commit is contained in:
veeso
2021-07-15 12:24:20 +02:00
parent e3a9d253f7
commit 4093ba169c
9 changed files with 42 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/utils/fmt.rs
View File

@@ -120,10 +120,19 @@ pub fn align_text_center(text: &str, width: u16) -> String {
/// ### elide_path
///
/// Elide a path if longer than width
/// In this case, the path is formatted to {ANCESTOR[0]}/.../{PARENT[0]}/{BASENAME}
/// In this case, the path is formatted to {ANCESTOR[0]}/…/{PARENT[0]}/{BASENAME}
pub fn fmt_path_elide(p: &Path, width: usize) -> String {
fmt_path_elide_ex(p, width, 0)
}
/// ### fmt_path_elide_ex
///
/// Elide a path if longer than width
/// In this case, the path is formatted to {ANCESTOR[0]}/…/{PARENT[0]}/{BASENAME}
/// This function allows to specify an extra length to consider to elide path
pub fn fmt_path_elide_ex(p: &Path, width: usize, extra_len: usize) -> String {
let fmt_path: String = format!("{}", p.display());
match fmt_path.len() > width as usize {
match fmt_path.len() + extra_len > width as usize {
false => fmt_path,
true => {
// Elide
@@ -134,9 +143,9 @@ pub fn fmt_path_elide(p: &Path, width: usize) -> String {
if ancestors_len > 2 {
elided_path.push(ancestors.nth(ancestors_len - 2).unwrap());
}
// If ancestors_len is bigger than 3, push '...' and parent too
// If ancestors_len is bigger than 3, push '…' and parent too
if ancestors_len > 3 {
elided_path.push("...");
elided_path.push("…");
if let Some(parent) = p.ancestors().nth(1) {
elided_path.push(parent.file_name().unwrap());
}
@@ -390,7 +399,7 @@ mod tests {
// Above max size, only one ancestor
assert_eq!(fmt_path_elide(p, 8), String::from("/develop/pippo"));
let p: &Path = &Path::new("/develop/pippo/foo/bar");
assert_eq!(fmt_path_elide(p, 16), String::from("/develop/.../foo/bar"));
assert_eq!(fmt_path_elide(p, 16), String::from("/develop/…/foo/bar"));
}
#[test]