frank/sharkdp--bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat synced 2026-08-10 20:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge color scheme options into theme / BAT_THEME

Browse Source
This commit is contained in:
Tau Gärtli
2024-08-18 14:59:14 +02:00
parent b9b981f657
commit bc42149a72
12 changed files with 83 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/bat/app.rs
+5 -20
View File
@@ -9,7 +9,7 @@ use crate::{
config::{get_args_from_config_file, get_args_from_env_opts_var, get_args_from_env_vars},
};
use bat::style::StyleComponentList;
use bat::theme::{theme, ColorSchemePreference, DetectColorScheme, ThemeOptions, ThemeRequest};
use bat::theme::{theme, ThemeName, ThemeOptions, ThemePreference};
use bat::StripAnsiMode;
use clap::ArgMatches;
@@ -418,35 +418,20 @@ impl App {
let theme = self
.matches
.get_one::<String>("theme")
.map(|t| ThemeRequest::from_str(t).unwrap());
.map(|t| ThemePreference::from_str(t).unwrap())
.unwrap_or_default();
let theme_dark = self
.matches
.get_one::<String>("theme-dark")
.map(|t| ThemeRequest::from_str(t).unwrap());
.map(|t| ThemeName::from_str(t).unwrap());
let theme_light = self
.matches
.get_one::<String>("theme-light")
.map(|t| ThemeRequest::from_str(t).unwrap());
.map(|t| ThemeName::from_str(t).unwrap());
ThemeOptions {
theme,
theme_dark,
theme_light,
color_scheme: self.color_scheme_preference(),
}
}
pub(crate) fn color_scheme_preference(&self) -> ColorSchemePreference {
match self
.matches
.get_one::<String>("color-scheme")
.map(|s| s.as_str())
{
Some("auto") => ColorSchemePreference::Auto(DetectColorScheme::Auto),
Some("auto:always") => ColorSchemePreference::Auto(DetectColorScheme::Always),
Some("dark") => ColorSchemePreference::Dark,
Some("light") => ColorSchemePreference::Light,
Some("system") => ColorSchemePreference::System,
_ => unreachable!("other values for --color-scheme are not allowed"),
}
}
}