Skip to content

Commit

Permalink
fix: user_resource should be a flag instead of an option
Browse files Browse the repository at this point in the history
If the type of `user_resource` is `Option<bool>`,
it requires the user to specify the value of `user_resource`
when running the command `maa run`.
  • Loading branch information
wangl-cc committed Oct 12, 2023
1 parent 008d8f2 commit dddc68f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion maa-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ enum SubCommand {
/// if there are some resources with the same name.
/// Use at your own risk!
#[clap(long, verbatim_doc_comment)]
user_resource: Option<bool>,
user_resource: bool,
/// Run tasks in batch mode
///
/// If there are some input parameters in the task file,
Expand Down
4 changes: 2 additions & 2 deletions maa-cli/src/run/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub fn run(
dirs: &Dirs,
task: String,
addr: Option<String>,
user_resource: Option<bool>,
user_resource: bool,
batch: bool,
) -> Result<()> {
/*------------------------ Load MaaCore ------------------------*/
Expand Down Expand Up @@ -217,7 +217,7 @@ pub fn run(
}

// User resource in config directory
if user_resource.unwrap_or(asst_config.user_resource) {
if user_resource || asst_config.user_resource {
if config_dir.join("resource").exists() {
debug!("Loading user resource:", config_dir.display());
Assistant::load_resource(config_dir).context("Failed to load user resource!")?;
Expand Down

0 comments on commit dddc68f

Please sign in to comment.