Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: user_resource should be a bool instead of an option #74

Merged
merged 1 commit into from
Oct 12, 2023
Merged

fix: user_resource should be a bool instead of an option #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion maa-cli/src/main.rs
View file
Open in desktop
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
View file
Open in desktop
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