Merge pull request #78 from Julien-cpsn/ckaznable/main

Add support for home directory symbol (~) in file paths

Cargo.toml

@@ -40,6 +40,7 @@ boa_engine = { version = "0.18.0", default-features = false }
 parse_postman_collection = "0.2.3"
 curl-parser = { version = "0.3.1", default-features = false }
 clap = { version = "4.5.4", features = ["derive", "color", "suggestions"] }
+dirs = "5.0.1"
 arboard = "3.3.2"
 tokio = { version = "1.36.0", features = ["rt", "rt-multi-thread", "macros"] }
 parking_lot = { version = "0.12.2", features = ["serde"] }

README.md

@@ -279,6 +279,7 @@ https://github.com/NachoNievaG/atac.nvim
 | [My fork](https://github.com/Julien-cpsn/postman-collection-rs) of [postman_collection](https://github.com/mandrean/postman-collection-rs)       | 0.2.1                     | Deserialize Postman collection files                                                   |
 | [curl-parser](https://github.com/tyrchen/curl-parser)                                                                                            | 0.3.1                     | Parse cURL request files                                                               |
 | [clap](https://github.com/clap-rs/clap)                                                                                                          | 4.5.0                     | Command Line Argument Parser                                                           |
+| [dirs](https://github.com/dirs-dev/dirs-rs)                                                                                                      | 5.0.1                     | Use system files                                                                       |
 | [arboard](https://github.com/1Password/arboard)                                                                                                  | 3.3.2                     | Copy response body to clipboard                                                        |
 | [tokio](https://github.com/tokio-rs/tokio)                                                                                                       | 1.0.0                     | Handle asynchronous requests                                                           |
 | [parking_lot](https://github.com/Amanieu/parking_lot)                                                                                            | 0.12.2                    | Smaller, faster and more flexible implementation of RwLock and Mutex. Used everywhere. |

src/app/files/key_bindings.rs

@@ -11,6 +11,7 @@ use ratatui::text::Span;
 use serde::Deserialize;
 
 use crate::app::app::App;
+use crate::app::files::utils::expand_tilde;
 use crate::panic_error;
 
 #[derive(Default, Copy, Clone, Deserialize)]
@@ -272,7 +273,7 @@ impl App<'_> {
     pub fn parse_key_bindings_file(&mut self) {
         let path = match env::var("ATAC_KEY_BINDINGS") {
             // If the ATAC_KEY_BINDINGS environment variable exists
-            Ok(env_key_bindings) => PathBuf::from(env_key_bindings),
+            Ok(env_key_bindings) => expand_tilde(PathBuf::from(env_key_bindings)),
             Err(_) => {
                 println!("No key bindings file found\n");
                 return;
@@ -307,4 +308,4 @@ pub fn unique_key_and_help(help: Span<'static>, key: Span<'static>) -> Vec<Span<
     else {
         vec![help, Span::raw(" "), key]
     }
-}
+}

src/app/files/mod.rs

@@ -3,4 +3,5 @@ pub mod environment;
 pub mod log;
 pub mod config;
 pub mod key_bindings;
-pub mod import;
+pub mod import;
+pub mod utils;

src/app/files/utils.rs

@@ -0,0 +1,15 @@
+use std::path::PathBuf;
+
+pub(crate) fn expand_tilde(path_buf: PathBuf) -> PathBuf {
+    if !path_buf.starts_with("~/") {
+        return path_buf;
+    }
+
+    match dirs::home_dir() {
+        Some(mut home_dir) => {
+            home_dir.push(path_buf.strip_prefix("~/").unwrap());
+            return home_dir;
+        },
+        None => panic!("No home directory found when trying to expand ~")
+    }
+}

src/app/startup/args.rs

@@ -3,6 +3,7 @@ use std::path::PathBuf;
 use clap::{Parser, Subcommand};
 use clap::builder::Styles;
 use lazy_static::lazy_static;
+use crate::app::files::utils::expand_tilde;
 use crate::panic_error;
 
 #[derive(Parser, Debug)]
@@ -77,11 +78,11 @@ lazy_static! {
 
         let (directory, is_directory_from_env) = match args.directory {
             // If a directory was provided with a CLI argument
-            Some(arg_directory) => (arg_directory, false),
+            Some(arg_directory) => (expand_tilde(arg_directory), false),
             // If no directory was provided with the CLI
             None => match env::var("ATAC_MAIN_DIR") {
                 // If the ATAC_MAIN_DIR environment variable exists
-                Ok(env_directory) => (PathBuf::from(env_directory), true),
+                Ok(env_directory) => (expand_tilde(PathBuf::from(env_directory)), true),
                 Err(_) => panic_error("No directory provided, provide one either with `--directory <dir>` or via the environment variable `ATAC_MAIN_DIR`")
             }
         };
@@ -93,4 +94,4 @@ lazy_static! {
             should_save: !args.dry_run
         }
     };
-}
+}