diff options
| -rw-r--r-- | crates/cli/src/run.rs | 6 | ||||
| -rw-r--r-- | lib/mihi/src/lib.rs | 23 |
2 files changed, 22 insertions, 7 deletions
diff --git a/crates/cli/src/run.rs b/crates/cli/src/run.rs index 31f160e..06d4551 100644 --- a/crates/cli/src/run.rs +++ b/crates/cli/src/run.rs @@ -496,7 +496,11 @@ pub fn run(args: Vec<String>) { if !inflection_only && !run_words(&list, &locale) { break; } - if let Ok(words_to_inflect) = mihi::select_words_except(&list, &flags) { + let cats = match category { + Some(cat) => vec![cat], + None => vec![Category::Noun, Category::Adjective], + }; + if let Ok(words_to_inflect) = mihi::select_words_except(&list, &cats, &flags) { if !run_inflect_words(&words_to_inflect, &locale) { break; } diff --git a/lib/mihi/src/lib.rs b/lib/mihi/src/lib.rs index ea7839e..8153b87 100644 --- a/lib/mihi/src/lib.rs +++ b/lib/mihi/src/lib.rs @@ -659,11 +659,23 @@ pub fn select_relevant_words( } /// Select a set of words except for the ones passed in the `excluded` -/// vector. It also accepts a set of boolean `flags` as with functions like -/// `select_relevant_words`. -pub fn select_words_except(excluded: &[Word], flags: &Vec<String>) -> Result<Vec<Word>, String> { +/// vector. You have to pass the categories to be selected via the `categories` +/// parameter, which cannot be empty. It also accepts a set of boolean `flags` +/// as with functions like `select_relevant_words`. +pub fn select_words_except( + excluded: &[Word], + categories: &[Category], + flags: &Vec<String>, +) -> Result<Vec<Word>, String> { + assert!(!categories.is_empty()); + let ids = excluded.iter().map(|w| w.id).collect::<Vec<i32>>(); let placeholders = ids.iter().map(|_| "?").collect::<Vec<_>>().join(", "); + let cats = categories + .iter() + .map(|c| format!("{}", *c as isize)) + .collect::<Vec<_>>() + .join(", "); let conn = get_connection()?; let mut stmt = conn @@ -673,12 +685,11 @@ pub fn select_words_except(excluded: &[Word], flags: &Vec<String>) -> Result<Vec kind, category, regular, locative, gender, suffix, translation, \ succeeded, steps, flags, weight \ FROM words \ - WHERE id NOT IN ({}) AND category IN ({}, {}) AND translation != '{{}}' {} \ + WHERE id NOT IN ({}) AND category IN ({}) AND translation != '{{}}' {} \ ORDER BY weight DESC, succeeded ASC, updated_at DESC LIMIT 5", placeholders, - Category::Noun as isize, - Category::Adjective as isize, + cats, flags_clause(flags) ) .as_str(), |