Added tilda in paths support [not tested]

Author: icelayer

src/base/config.rs

@@ -1,9 +1,11 @@
+#![allow(deprecated)]
+
 use crate::base::filesystem;
 use directories::ProjectDirs;
 use std::path::PathBuf;
 
-pub const VERSION: &str = "0.3.0";
-pub const DEV_MODE: bool = false;
+pub const VERSION: &str = "0.3.1-dev";
+pub const DEV_MODE: bool = true;
 pub const SAFE_HISTORY: bool = true;
 
 pub const SYS_BITS: u32 = 2048;
@@ -12,6 +14,18 @@ pub const BLOCK_BITS: u32 = 4096000;
 
 pub const SUPPORTED_FORMATS: [&str; 2] = ["text", "file"];
 
+pub fn linux_home_path() -> String {
+    std::env::home_dir().unwrap().to_str().unwrap().to_string()
+}
+
+pub fn tilda_to_abs_path(path_with_tilda: String) -> String {
+    let mut path_with_tilda = path_with_tilda;
+    if &path_with_tilda.chars().nth(0).unwrap() == &'~' {
+        path_with_tilda = linux_home_path() + &path_with_tilda[1..];
+    }
+    path_with_tilda
+}
+
 pub fn path() -> PathBuf {
     let result_path = ProjectDirs::from("su", "bald", "cwe-client")
         .unwrap()

src/command/export.rs

@@ -12,33 +12,27 @@ pub fn run() {
                 return false;
             }
         }
-        if !PathBuf::from(string).is_absolute() {
-            return false;
-        }
         return true;
     }
     loop {
         base::log(
             "Please enter ABSOLUTE path to export file: (example: /home/user/me.contact)",
             5,
         );
-        let export_path = base::input("Export path: ");
-        if check(export_path.clone()) {
-            let server_host = base::config::default_url();
-            let uuid = base::uuid::get();
-            let public_key =
-                base::filesystem::cat(&base::filesystem::new_path("base-keys/my-key.pub"));
+        let export_path = base::correct_input("Export path: ", check);
+        let export_path = base::config::tilda_to_abs_path(export_path);
+
+        let server_host = base::config::default_url();
+        let uuid = base::uuid::get();
+        let public_key = base::filesystem::cat(&base::filesystem::new_path("base-keys/my-key.pub"));
 
-            base::filesystem::echo(
-                server_host + "\n" + &uuid + "\n" + &public_key,
-                &PathBuf::from(export_path),
-            );
+        base::filesystem::echo(
+            server_host + "\n" + &uuid + "\n" + &public_key,
+            &PathBuf::from(export_path),
+        );
 
-            base::log("Successfully exported your contact!", 0);
+        base::log("Successfully exported your contact!", 0);
 
-            break;
-        } else {
-            base::log("Sorry, but this name is invalid", 3);
-        }
+        break;
     }
 }

src/command/history.rs

@@ -12,9 +12,6 @@ pub fn run(passphrase: String) {
                 return false;
             }
         }
-        if !PathBuf::from(string).is_absolute() {
-            return false;
-        }
         return true;
     }
     let stored_messages_from = base::filesystem::ls(
@@ -104,6 +101,8 @@ pub fn run(passphrase: String) {
             );
 
             let path = base::correct_input("Select place to extract data: ", check);
+            let path = base::config::tilda_to_abs_path(path);
+
             base::filesystem::becho(file, &PathBuf::from(path));
 
             base::log("Extracted!", 0);

src/command/import.rs

@@ -2,11 +2,28 @@ use crate::base;
 use std::path::PathBuf;
 
 pub fn run() {
-    base::log("Please enter ABSOLUTE path to contact file: ", 5);
-    let path = base::correct_input("Path to contact: ", base::filesystem::exist_abs);
-    if path == "exit".to_string() {
-        return;
-    }
+    let path = {
+        fn check(string: String) -> bool {
+            let forbidden_chars = vec![
+                " ", "\n", "\r", "\t", "\\", ":", "*", "?", "<", ">", "|", "&", "$", "!", "'",
+                "\"", "`", "(", ")", "{", "}", "[", "]",
+            ];
+            for forbidden_char in &forbidden_chars {
+                if string.contains(forbidden_char) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        base::log("Please enter path to contact file: ", 5);
+        let path = base::correct_input("Path to contact: ", check);
+        let path = base::config::tilda_to_abs_path(path);
+        if path == "exit".to_string() {
+            return;
+        }
+        path
+    };
 
     let lines = base::filesystem::cat_lines(&PathBuf::from(path.as_str()));
     let contact_server_host = lines[0].clone();

src/command/send.rs

@@ -26,6 +26,7 @@ pub fn run(passphrase: String) {
         }
         "file" => {
             fn check(path: String) -> bool {
+                let path = base::config::tilda_to_abs_path(path);
                 if base::filesystem::get_file_name(path.clone()).contains('|') {
                     false
                 } else {