Fixed termscp panics when displaying long non-ascii filenames

This commit is contained in:
veeso
2022-04-07 11:30:57 +02:00
committed by Christian Visintin
parent f2e5bf4441
commit 66adad3135
5 changed files with 161 additions and 3 deletions

View File

@@ -31,6 +31,7 @@ use chrono::prelude::*;
use std::path::{Path, PathBuf};
use std::time::{Duration, SystemTime};
use tuirealm::tui::style::Color;
use unicode_width::UnicodeWidthStr;
/// ### fmt_pex
///
@@ -85,7 +86,7 @@ pub fn fmt_path_elide(p: &Path, width: usize) -> String {
/// 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() + extra_len > width as usize {
match fmt_path.width() + extra_len > width as usize {
false => fmt_path,
true => {
// Elide

View File

@@ -32,6 +32,7 @@ pub mod fmt;
pub mod parser;
pub mod path;
pub mod random;
pub mod string;
pub mod ui;
#[cfg(test)]

45
src/utils/string.rs Normal file
View File

@@ -0,0 +1,45 @@
//! # String
//!
//! String related utilities
/**
* MIT License
*
* termscp - Copyright (c) 2022 Christian Visintin
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
/// Get a substring considering utf8 characters
pub fn secure_substring(string: &str, start: usize, end: usize) -> String {
assert!(end >= start);
string.chars().take(end).skip(start).collect()
}
#[cfg(test)]
mod test {
use super::*;
#[test]
fn should_get_secure_substring() {
assert_eq!(secure_substring("christian", 2, 5).as_str(), "ris");
assert_eq!(secure_substring("россия", 3, 5).as_str(), "си");
}
}