cry/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to terminal-colorsaurus

Browse source
This commit is contained in:
Teoh Han Hui 2024-07-13 23:37:41 +08:00
parent dbecd3d705
commit da5f6ef655
No known key found for this signature in database
GPG key ID: D43E2BABAF97DCAE
4 changed files with 41 additions and 659 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/hyfetch/Cargo.toml
View file

@ -25,7 +25,7 @@ shell-words = { workspace = true, features = ["std"] }
strum = { workspace = true, features = ["derive", "std"] }
supports-color = { workspace = true, features = [] }
tempfile = { workspace = true, features = [] }
termbg = { workspace = true, features = [] }
terminal-colorsaurus = { workspace = true, features = [] }
terminal_size = { workspace = true, features = [] }
thiserror = { workspace = true, features = [] }
time = { workspace = true, features = ["local-offset", "std"] }

21
crates/hyfetch/src/bin/hyfetch.rs
View file

@ -1,7 +1,7 @@
use std::borrow::Cow;
use std::cmp;
use std::fs::{self, File};
use std::io::{self, ErrorKind, IsTerminal, Read, Write};
use std::io::{self, IsTerminal, Read, Write};
use std::path::Path;
use anyhow::{Context, Result};
@ -16,6 +16,7 @@ use hyfetch::types::{AnsiMode, Backend, TerminalTheme};
use hyfetch::utils::get_cache_path;
use palette::Srgb;
use strum::{EnumCount, VariantArray, VariantNames};
use terminal_colorsaurus::{background_color, QueryOptions};
use terminal_size::terminal_size;
use time::{Month, OffsetDateTime};
use tracing::debug;
@ -166,7 +167,7 @@ fn main() -> Result<()> {
fn read_config(path: &Path) -> Result<Option<Config>> {
let mut file = match File::open(path) {
Ok(file) => file,
Err(err) if err.kind() == ErrorKind::NotFound => {
Err(err) if err.kind() == io::ErrorKind::NotFound => {
return Ok(None);
},
Err(err) => {
@ -201,12 +202,16 @@ fn create_config(
) -> Result<Config> {
// Detect terminal environment (doesn't work for all terminal emulators,
// especially on Windows)
let det_bg = match termbg::rgb(std::time::Duration::from_millis(100)) {
Ok(rgb) => Some(Srgb::<u16>::new(rgb.r, rgb.g, rgb.b).into_format::<u8>()),
Err(termbg::Error::Unsupported) => None,
Err(err) => {
return Err(err).context("failed to get background color");
},
let det_bg = if io::stdout().is_terminal() {
match background_color(QueryOptions::default()) {
Ok(bg) => Some(Srgb::<u16>::new(bg.r, bg.g, bg.b).into_format::<u8>()),
Err(terminal_colorsaurus::Error::UnsupportedTerminal) => None,
Err(err) => {
return Err(err).context("failed to get terminal background color");
},
}
} else {
None
};
debug!(?det_bg, "detected background color");
let det_ansi = supports_color::on(supports_color::Stream::Stdout).map(|color_level| {