technofab/pay-respects
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/pay-respects.git synced 2025-12-13 06:50:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: wrong condition parsing

Browse source
This commit is contained in:
iff 2023-07-31 19:17:46 +02:00
parent 43620afb77
commit 2497ba5bcb
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/corrections.rs
View file

@ -46,7 +46,7 @@ fn match_pattern(executable: &str, command: &str, error_msg: &str) -> Option<Str
for pattern in pattern { for pattern in pattern {
if error_msg.contains(pattern) { if error_msg.contains(pattern) {
for suggest in suggest { for suggest in suggest {
if let Some(suggest) = check_suggest(suggest, command, error_msg) { if let Some(suggest) = check_condition(suggest, command, error_msg) {
return Some(suggest); return Some(suggest);
} }
} }
@ -59,21 +59,23 @@ fn match_pattern(executable: &str, command: &str, error_msg: &str) -> Option<Str
} }
} }
fn check_suggest(suggest: &str, command: &str, error_msg: &str) -> Option<String> { fn check_condition(suggest: &str, command: &str, error_msg: &str) -> Option<String> {
if !suggest.starts_with('#') { if !suggest.starts_with('#') {
return Some(suggest.to_owned()); return Some(suggest.to_owned());
} }
let mut lines = suggest.lines().collect::<Vec<&str>>(); let mut lines = suggest.lines().collect::<Vec<&str>>();
let conditions = lines.first().unwrap().trim().replacen('#', "", 1); let mut conditions = String::new();
let mut conditions = conditions.trim_start_matches('[').to_string(); for (i, line) in lines[0..].iter().enumerate() {
for (i, line) in lines[1..].iter().enumerate() {
conditions.push_str(line); conditions.push_str(line);
if line.ends_with(']') { if line.ends_with(']') {
lines = lines[i + 1..].to_vec(); lines = lines[i..].to_vec();
break; break;
} }
} }
let conditions = conditions.split(',').collect::<Vec<&str>>(); let conditions = conditions
.trim_start_matches(&['#', '['])
.trim_end_matches(']')
.split(',').collect::<Vec<&str>>();
for condition in conditions { for condition in conditions {
let (mut condition, arg) = condition.split_once('(').unwrap(); let (mut condition, arg) = condition.split_once('(').unwrap();