From 2fec70e30731975ab22b37b6706e7a5e92e906d8 Mon Sep 17 00:00:00 2001 From: SadlyNotSappho Date: Fri, 23 Jun 2023 09:31:44 -0700 Subject: [PATCH] my code is so goddamn jank --- src/lib.rs | 12 ++++++++---- src/main.rs | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 81ca91b..be0d64f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -42,18 +42,22 @@ pub fn create_config(file: &String) -> bool { } pub fn read_config(file: &String) -> Config { - let read = fs::read_to_string(file).expect("couldn't read config file"); + let replaced = file.replace('~', &get_home()[..]); // replace ~ with $HOME + let read = fs::read_to_string(replaced).expect("couldn't read config file"); serde_json::from_str(&read[..]).expect("couldn't parse json") } -pub fn ensure_exists(path: String) { - let p = Path::new(&path); +pub fn ensure_exists(path: &String) { + let replaced = path.replace('~', &get_home()[..]); // replace ~ with $HOME + let p = Path::new(&replaced); + println!("{}", replaced); + println!("{:?}", p.exists()); if !p.exists() { fs::create_dir_all(p).expect("couldn't create folder") } } -#[derive(Serialize, Deserialize)] +#[derive(Serialize, Deserialize, Debug)] pub struct Config { pub latest_date: String, pub cache_folder: String, diff --git a/src/main.rs b/src/main.rs index aa0e3aa..387dcd8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,8 +11,10 @@ fn main() { let args = Args::parse(); let config_file = args.config_file; - + println!("{}", config_file); ggg::create_config(&config_file); let config = ggg::read_config(&config_file); - ggg::ensure_exists(config.cache_folder) + ggg::ensure_exists(&config.cache_folder); + + println!("{:?}", &config); }