From 72574323ba67dea4c0c02681d446d193f13ef0d6 Mon Sep 17 00:00:00 2001 From: hr567 Date: Tue, 4 Jun 2024 11:17:25 +0800 Subject: [PATCH] Add default value for analysis dir Signed-off-by: hr567 --- Cargo.toml | 2 +- src/main.rs | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0142cbd..9b38217 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -clap = { version = "4.5.4", features = ["derive"] } +clap = { version = "4.5.4", features = ["derive", "string"] } dashmap = { version = "5.5.3", features = ["serde"] } futures = "0.3.30" indicatif = "0.17.8" diff --git a/src/main.rs b/src/main.rs index 3c904bd..d1178cc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,6 @@ use std::cell::RefCell; use std::collections::{BTreeMap, HashMap, VecDeque}; +use std::env::current_dir; use std::fmt::Write; use std::io; use std::path::PathBuf; @@ -20,20 +21,23 @@ use tracing::Instrument; #[derive(Parser, Debug)] #[command(version, about, long_about = None)] struct Args { - #[arg(short, long)] + #[arg(short, long, default_value = + current_dir().unwrap().into_os_string())] directory: PathBuf, #[arg(short, long, default_value = "16")] jobs: usize, - #[arg(short = 'f', long)] - keywords_file: Option, + #[arg(short = 'f', long, default_value = + current_dir().unwrap().join("keywords.txt").into_os_string())] + keywords_file: PathBuf, #[arg(last = true)] keywords: Vec, } static ARGS: Lazy = Lazy::new(|| { let mut args = Args::parse(); - if let Some(keywords_file) = args.keywords_file.take() { - let content = std::fs::read_to_string(keywords_file).expect("failed to read keywords file"); + if args.keywords_file.exists() { + let content = + std::fs::read_to_string(&args.keywords_file).expect("failed to read keywords file"); args.keywords.extend(content.lines().map(|s| s.to_string())); } args