Skip to content

Commit

Permalink
Properly parse entries
Browse files Browse the repository at this point in the history
  • Loading branch information
bensadeh committed Jan 14, 2024
1 parent 1bcbb78 commit 2ffbed5
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 12 deletions.
2 changes: 1 addition & 1 deletion config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[[regexps]]
regular_expression = 'Started (.*)\.'
style = { fg = "red" }
style = { fg = "redd" }

[[regexps]]
regular_expression = 'Stopped .*'
Expand Down
33 changes: 22 additions & 11 deletions src/theme/mapper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,28 @@ fn to_style(style: theme::raw::Style) -> Style {
}

fn map_to_color_or_exit_early(color: &str) -> Color {
match color.to_lowercase().as_str() {
"red" => Color::Red,
"green" => Color::Green,
"yellow" => Color::Yellow,
"blue" => Color::Blue,
"magenta" => Color::Magenta,
"cyan" => Color::Cyan,
"white" => Color::White,
"black" => Color::Black,
_ => panic!("Unsupported color: {}", color),
}
let color = match color.to_lowercase().as_str() {
"red" => Ok(Color::Red),
"green" => Ok(Color::Green),
"yellow" => Ok(Color::Yellow),
"blue" => Ok(Color::Blue),
"magenta" => Ok(Color::Magenta),
"purple" => Ok(Color::Magenta),
"cyan" => Ok(Color::Cyan),
"white" => Ok(Color::White),
"black" => Ok(Color::Black),
"" => Ok(Color::Default),
_ => Err(color),
};

color.unwrap_or_else(|color| {
eprintln!(
"{}: {} is not a valid color",
Style::new().bold().paint("Could not parse config.toml"),
Color::Red.paint(color)
);
std::process::exit(1);
})
}

fn process_keywords(raw_keywords: Option<Vec<Keyword>>) -> Vec<theme::processed::Keyword> {
Expand Down

0 comments on commit 2ffbed5

Please sign in to comment.