From e9021abf60ae32184d817928bd3339821672c1d2 Mon Sep 17 00:00:00 2001 From: Valerie Date: Tue, 28 Jun 2022 18:53:19 -0400 Subject: [PATCH] fixed dir flag not expanding --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/main.rs | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b220df..499a386 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ [[package]] name = "config" -version = "0.1.4" +version = "0.1.5" dependencies = [ "regex", "toml", diff --git a/Cargo.toml b/Cargo.toml index cd5408e..1b436db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "config" -version = "0.1.4" +version = "0.1.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/main.rs b/src/main.rs index 3ce9e2b..ec1d33c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -91,10 +91,12 @@ fn main() -> Result<(), Box>{ if prop_path.is_none() { error::no_property(entry, "path"); } - let i_file_path = prop_path.unwrap().as_str().unwrap(); - let file_path = PathBuf::from(i_file_path); + let raw_path = prop_path.unwrap().as_str().unwrap(); + let expanded = home_regex.replace(raw_path, &home_dir); + let file_path = PathBuf::from(expanded.to_string()); if file_path.is_dir() { - path = true; + println!("{}", expanded); + return Ok(()); } else { let i_parent = file_path.parent().unwrap().to_str().unwrap(); let parent = home_regex.replace(i_parent, home_dir);