From 5cc40a564ad1f5dec2fe5ce71cd35d44da6d0d74 Mon Sep 17 00:00:00 2001 From: imgurbot12 Date: Mon, 7 Aug 2023 16:06:58 -0700 Subject: [PATCH] feat: cleanup and improve logging --- rmenu/Cargo.toml | 2 +- rmenu/src/cache.rs | 1 - rmenu/src/exec.rs | 2 +- rmenu/src/main.rs | 8 +++++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/rmenu/Cargo.toml b/rmenu/Cargo.toml index de0807f..4424d80 100644 --- a/rmenu/Cargo.toml +++ b/rmenu/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rmenu" -version = "0.0.0" +version = "0.0.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/rmenu/src/cache.rs b/rmenu/src/cache.rs index 97b75a8..f9522e4 100644 --- a/rmenu/src/cache.rs +++ b/rmenu/src/cache.rs @@ -80,7 +80,6 @@ pub fn write_cache(name: &str, cfg: &PluginConfig, entries: &Vec) -> Resu CacheSetting::NoCache => {} _ => { let path = cache_file(name); - println!("write! {:?}", path); let data = bincode::serialize(entries)?; let mut f = fs::File::create(path)?; f.write_all(&data)?; diff --git a/rmenu/src/exec.rs b/rmenu/src/exec.rs index f5858a4..ec0420d 100644 --- a/rmenu/src/exec.rs +++ b/rmenu/src/exec.rs @@ -41,7 +41,7 @@ fn parse_args(exec: &str) -> Vec { } pub fn execute(action: &Action, term: Option) { - log::info!("executing: {} {:?}", action.name, action.exec); + log::info!("executing: {:?} {:?}", action.name, action.exec); let args = match &action.exec { Method::Run(exec) => parse_args(&exec), Method::Terminal(exec) => { diff --git a/rmenu/src/main.rs b/rmenu/src/main.rs index 2986497..1c73f1b 100644 --- a/rmenu/src/main.rs +++ b/rmenu/src/main.rs @@ -128,6 +128,7 @@ impl Args { "-" => "/dev/stdin", _ => &self.input, }; + log::info!("reading from {fpath:?}"); let file = File::open(fpath).map_err(|e| RMenuError::FileError(e))?; let reader = BufReader::new(file); let mut entries = vec![]; @@ -236,10 +237,11 @@ impl Args { //TODO: improve looks and css fn main() -> Result<(), RMenuError> { - // enable log if env-var is present - if std::env::var("RUST_LOG").is_ok() { - env_logger::init(); + // enable log and set default level + if std::env::var("RUST_LOG").is_err() { + std::env::set_var("RUST_LOG", "info"); } + env_logger::init(); // parse cli / config / application-settings let app = Args::parse_app()?; // change directory to configuration dir