Fix errors during unicode handling

Author: 0xf104a

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pretty-copy"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 authors = ["Anna-Sophie Zaitsewa"]
 description = "Multi-purpose copying utility which allows to see progress of copying operations"

src/copy.rs

@@ -152,6 +152,7 @@ pub fn copy_directory(source: &str, target: &str, args: &Args) -> bool{
     let reader_proxy = get_reader_proxy_for_url(source).unwrap();
     let is_new_dir = if writer_proxy.is_directory(target){
         target_path = writer_proxy.join_path(&target_path, &reader_proxy.dirname(source));
+        writer_proxy.make_directory(&target_path);
         false
     } else {
         writer_proxy.make_directory(target);

src/progress.rs

@@ -4,6 +4,7 @@ pub mod dummy;
 pub trait ProgressDisplay {
      fn new() -> Self where Self: Sized;
      fn set_progress(&mut self, status: &str, bytes_out: usize);
+     #[allow(dead_code)]
      fn update_status(&mut self, new_status: &str);
      fn add_bytes_written(&mut self, bytes_written: usize);
      fn set_size(&mut self, bytes_total: usize);

src/progress/console.rs

@@ -3,7 +3,7 @@ use colored::Colorize;
 use termion::terminal_size;
 
 use crate::progress::ProgressDisplay;
-use crate::utils::get_time;
+use crate::utils::{get_time, safe_string_trim_left, safe_string_trim_right};
 
 const MAX_STATUS_WIDTH: u16 = 128;
 const STATUS_WIDTH_FACTOR: f32 = 0.2;
@@ -26,7 +26,8 @@ fn pad_status(status: String, max_width: u16) -> String {
         }
         let half_width = (max_width - 3) / 2;
         let end_start = status_len - half_width + (max_width - 3) % 2;
-        return format!("{}...{}", &status[..half_width], &status[end_start..]);
+        return format!("{}...{}", safe_string_trim_left(status.clone(), half_width), 
+                       safe_string_trim_right(status.clone(), end_start));
     }
 
     format!("{:width$}", status, width = max_width)

src/reader/file.rs

@@ -129,7 +129,8 @@ impl Reader for FileReader{
 
     #[inline]
     fn is_directory(url: &str) -> bool where Self: Sized {
-        std::path::Path::new(url).is_dir()
+        let path = Path::new(url);
+        path.is_dir() && path.exists()
     }
 
     fn get_size(&self) -> usize {
@@ -188,4 +189,17 @@ mod tests {
         let url = "/tmp/foo/bar/file";
         assert_eq!(FileReader::relative_path(src_arg, url), "tmp/foo/bar/file");
     }
+
+    #[test]
+    fn test_relative_path_unicode() {
+        let src_arg = "/tmp/документи";
+        let url = "/tmp/документи/bar/file";
+        assert_eq!(FileReader::relative_path(src_arg, url), "bar/file");
+        let src_arg = "localdir/документи";
+        let url = "localdir/документи/bar/file";
+        assert_eq!(FileReader::relative_path(src_arg, url), "bar/file");
+        let src_arg = "/";
+        let url = "/tmp/документи/bar/file";
+        assert_eq!(FileReader::relative_path(src_arg, url), "tmp/документи/bar/file");
+    }
 }

src/utils.rs

@@ -12,4 +12,106 @@ pub fn get_time() -> u128{
     let start = SystemTime::now();
     start.duration_since(UNIX_EPOCH)
          .expect("Wrong system time").as_millis()
-}
+}
+
+/// 
+/// Takes first `n` characters of string
+/// Works with Unicode
+/// 
+/// # Arguments 
+/// 
+/// * `s`: string to trim
+/// * `n`: number of chars to take
+/// 
+/// returns: String: trimmed string
+///
+pub fn safe_string_trim_left(s: String, n: usize) -> String{
+    let mut result: String = String::new();
+    let mut r: usize = n;
+    for c in s.chars(){
+        if r == 0{
+            break;
+        }
+        result.push(c);
+        r -= 1;
+    }
+    result
+}
+
+///
+/// Takes last `n` characters of string
+/// Works with Unicode
+///
+/// # Arguments 
+///
+/// * `s`: string to trim
+/// * `n`: number of chars to take
+///
+/// returns: String: trimmed string
+///
+pub fn safe_string_trim_right(s: String, n: usize) -> String{
+    let mut result: String = String::new();
+    let mut r: usize = 0;
+    for c in s.chars(){
+        if r < n{
+            r += 1;
+            continue;
+        }
+        result.push(c);
+        r += 1;
+    }
+    result
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_safe_string_trim_left_basic() {
+        let input = String::from("Hello, World!");
+        assert_eq!(safe_string_trim_left(input, 5), "Hello");
+    }
+
+    #[test]
+    fn test_safe_string_trim_left_unicode() {
+        let input = String::from("🌍🚀🌌🛸");
+        assert_eq!(safe_string_trim_left(input, 2), "🌍🚀");
+    }
+
+    #[test]
+    fn test_safe_string_trim_left_empty_string() {
+        let input = String::from("");
+        assert_eq!(safe_string_trim_left(input, 3), "");
+    }
+
+    #[test]
+    fn test_safe_string_trim_left_more_chars_than_length() {
+        let input = String::from("Short");
+        assert_eq!(safe_string_trim_left(input, 10), "Short");
+    }
+
+    #[test]
+    fn test_safe_string_trim_right_basic() {
+        let input = String::from("Hello, World!");
+        assert_eq!(safe_string_trim_right(input, 6), " World!");
+    }
+
+    #[test]
+    fn test_safe_string_trim_right_unicode() {
+        let input = String::from("🌍🚀🌌🛸");
+        assert_eq!(safe_string_trim_right(input, 2), "🌌🛸");
+    }
+
+    #[test]
+    fn test_safe_string_trim_right_empty_string() {
+        let input = String::from("");
+        assert_eq!(safe_string_trim_right(input, 3), "");
+    }
+
+    #[test]
+    fn test_safe_string_trim_right_more_chars_than_length() {
+        let input = String::from("Short");
+        assert_eq!(safe_string_trim_right(input, 10), "");
+    }
+}