Skip to content

[clap-v3-utils] Add try_get_language and deprecate acquire_language #430

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

Merged
samkim-crypto merged 3 commits into from
Mar 26, 2024
Merged

[clap-v3-utils] Add try_get_language and deprecate acquire_language #430

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44e3702
add `try_get_language`
samkim-crypto Mar 26, 2024
810573d
deprecate `acquire_language`
samkim-crypto Mar 26, 2024
eef7644
add constant `POSSIBLE_LANGUAGES` and add comment to also update `try…
samkim-crypto Mar 26, 2024
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
39 changes: 29 additions & 10 deletions clap-v3-utils/src/keygen/mnemonic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,21 @@ pub fn try_get_word_count(matches: &ArgMatches) -> Result<Option<usize>, Box<dyn
}))
}

// The constant `POSSIBLE_LANGUAGES` and function `try_get_language` must always be updated in sync
const POSSIBLE_LANGUAGES: &[&str] = &[
"english",
"chinese-simplified",
"chinese-traditional",
"japanese",
"spanish",
"korean",
"french",
"italian",
];
pub fn language_arg<'a>() -> Arg<'a> {
Arg::new(LANGUAGE_ARG.name)
.long(LANGUAGE_ARG.long)
.value_parser(PossibleValuesParser::new([
"english",
"chinese-simplified",
"chinese-traditional",
"japanese",
"spanish",
"korean",
"french",
"italian",
]))
.value_parser(PossibleValuesParser::new(POSSIBLE_LANGUAGES))
.default_value("english")
.value_name("LANGUAGE")
.takes_value(true)
Expand All @@ -77,6 +79,7 @@ pub fn no_passphrase_arg<'a>() -> Arg<'a> {
.help(NO_PASSPHRASE_ARG.help)
}

#[deprecated(since = "2.0.0", note = "Please use `try_get_language` instead")]
pub fn acquire_language(matches: &ArgMatches) -> Language {
match matches
.get_one::<String>(LANGUAGE_ARG.name)
Expand All @@ -95,6 +98,22 @@ pub fn acquire_language(matches: &ArgMatches) -> Language {
}
}

pub fn try_get_language(matches: &ArgMatches) -> Result<Option<Language>, Box<dyn error::Error>> {
Ok(matches
.try_get_one::<String>(LANGUAGE_ARG.name)?
.map(|language| match language.as_str() {
"english" => Language::English,
"chinese-simplified" => Language::ChineseSimplified,
"chinese-traditional" => Language::ChineseTraditional,
"japanese" => Language::Japanese,
"spanish" => Language::Spanish,
"korean" => Language::Korean,
"french" => Language::French,
"italian" => Language::Italian,
_ => unreachable!(),
}))
}

pub fn no_passphrase_and_message() -> (String, String) {
(NO_PASSPHRASE.to_string(), "".to_string())
}
Expand Down