lucas/lool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: 💄 improve code formatting

Browse Source
This commit is contained in:
Lucas Colombo 2024-03-31 01:32:13 -03:00
parent 30f87f9626
commit 7d79868eb4
Signed by: lucas
GPG Key ID: EF34786CFEFFAE35
10 changed files with 124 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/logger.rs
View File

@ -1,6 +1,4 @@
use log::Level;
use lool::logger::ConsoleLogger;
use {log::Level, lool::logger::ConsoleLogger};
fn main() {
ConsoleLogger::default_setup(Level::Trace, "test").unwrap();

16
examples/stylizer.rs
View File

@ -1,5 +1,7 @@
use eyre::{set_hook, DefaultHandler, Result};
use lool::cli::stylize::{stylize, Stylize};
use {
eyre::{set_hook, DefaultHandler, Result},
lool::cli::stylize::{stylize, Stylize},
};
fn setup_eyre() {
let _ = set_hook(Box::new(DefaultHandler::default_with));
@ -12,7 +14,10 @@ fn main() -> Result<()> {
let alt_red_bold = stylize(stylize("alt [red+bold]", "red"), "+bold");
let red_bold_italic = stylize("[red+bold|italic]", "red+bold|italic");
let alt_red_bold_italic = stylize(stylize(stylize("alt [red+bold|italic]", "red"), "+bold"), "+italic");
let alt_red_bold_italic = stylize(
stylize(stylize("alt [red+bold|italic]", "red"), "+bold"),
"+italic",
);
let red_on_blue = stylize("[white on blue]", "white on blue");
let rgb = stylize("[#3a95ef]", "#3a95ef");
@ -34,7 +39,10 @@ fn main() -> Result<()> {
println!("pre {} post", "[.blue()]".blue());
println!("pre {} post", "[.blue().bold()]".blue().bold());
println!("pre {} post", "[.blue().on_red().bold()]".blue().on_red().bold());
println!(
"pre {} post",
"[.blue().on_red().bold()]".blue().on_red().bold()
);
println!("pre {} post", "[.dim()]".dim());
println!("pre {} post", "[.blue().dim()]".blue().dim());

4
lib/cli/stylize/style.rs
View File

@ -1,6 +1,4 @@
use bitflags::bitflags;
use eyre::Context;
use std::borrow::Cow;
use {bitflags::bitflags, eyre::Context, std::borrow::Cow};
/// The 8 standard colors.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]

22
lib/cli/stylize/stylizer.rs
View File

@ -1,9 +1,13 @@
use super::style::{Color, StyleAttributes as StyleBitflags};
use eyre::Result;
use {
super::style::{Color, StyleAttributes as StyleBitflags},
eyre::Result,
};
pub mod instructions {
use super::{Result, StyleBitflags, Color};
use bitflags::parser::{from_str, ParseError};
use {
super::{Color, Result, StyleBitflags},
bitflags::parser::{from_str, ParseError},
};
pub struct StyledString {
pub fg: Option<Color>,
@ -27,7 +31,8 @@ pub mod instructions {
if instructions.starts_with("+") {
// only attributes
styled_string.attrs = attributes_from_str(instructions.trim_start_matches('+')).map_err(|e| eyre::eyre!(e))?;
styled_string.attrs = attributes_from_str(instructions.trim_start_matches('+'))
.map_err(|e| eyre::eyre!(e))?;
return Ok(styled_string);
}
@ -71,13 +76,16 @@ pub mod instructions {
}
2 => {
// Both fg and bg colors are provided
Ok((Some(Color::from_str(colors[0])?), Some(Color::from_str(colors[1])?)))
Ok((
Some(Color::from_str(colors[0])?),
Some(Color::from_str(colors[1])?),
))
}
_ => Err(eyre::eyre!("Invalid color instruction: {}", instruction)),
}
}
fn attributes_from_str (s: &str) -> Result<StyleBitflags, ParseError> {
fn attributes_from_str(s: &str) -> Result<StyleBitflags, ParseError> {
from_str(s.to_uppercase().as_str())
}
}

71
lib/cli/stylize/tests/stylizo.rs
View File

@ -2,11 +2,12 @@
mod parse_instruction {
use {
crate::cli::stylize::{
stylizer::instructions::{parse, parse_color_instruction}, style::{Color, StyleAttributes}
}, eyre::{set_hook, DefaultHandler}
style::{Color, StyleAttributes},
stylizer::instructions::{parse, parse_color_instruction},
},
eyre::{set_hook, DefaultHandler},
};
fn setup_eyre() {
let _ = set_hook(Box::new(DefaultHandler::default_with));
}
@ -16,11 +17,29 @@ mod parse_instruction {
setup_eyre();
assert_eq!(parse_color_instruction("red")?, (Some(Color::Red), None));
assert_eq!(parse_color_instruction("#FF0000")?, (Some(Color::TrueColor { r: 255, g: 0, b: 0 }), None));
assert_eq!(parse_color_instruction("on blue")?, (None, Some(Color::Blue)));
assert_eq!(parse_color_instruction("on #0000FF")?, (None, Some(Color::TrueColor { r: 0, g: 0, b: 255 })));
assert_eq!(parse_color_instruction("red on blue")?, (Some(Color::Red), Some(Color::Blue)));
assert_eq!(parse_color_instruction("#FF0000 on #0000FF")?, (Some(Color::TrueColor { r: 255, g: 0, b: 0 }), Some(Color::TrueColor { r: 0, g: 0, b: 255 })));
assert_eq!(
parse_color_instruction("#FF0000")?,
(Some(Color::TrueColor { r: 255, g: 0, b: 0 }), None)
);
assert_eq!(
parse_color_instruction("on blue")?,
(None, Some(Color::Blue))
);
assert_eq!(
parse_color_instruction("on #0000FF")?,
(None, Some(Color::TrueColor { r: 0, g: 0, b: 255 }))
);
assert_eq!(
parse_color_instruction("red on blue")?,
(Some(Color::Red), Some(Color::Blue))
);
assert_eq!(
parse_color_instruction("#FF0000 on #0000FF")?,
(
Some(Color::TrueColor { r: 255, g: 0, b: 0 }),
Some(Color::TrueColor { r: 0, g: 0, b: 255 })
)
);
assert!(parse_color_instruction("red on blue on green").is_err());
assert!(parse_color_instruction("red on").is_err());
assert!(parse_color_instruction("on").is_err());
@ -34,7 +53,6 @@ mod parse_instruction {
#[test]
fn test_parse_instructions() -> eyre::Result<()> {
setup_eyre();
let styled_string = parse("red on blue")?;
@ -54,8 +72,14 @@ mod parse_instruction {
// ##RRGGBB
let styled_string = parse("#FF0000 on #0000FF")?;
assert_eq!(styled_string.fg, Some(Color::TrueColor { r: 255, g: 0, b: 0 }));
assert_eq!(styled_string.bg, Some(Color::TrueColor { r: 0, g: 0, b: 255 }));
assert_eq!(
styled_string.fg,
Some(Color::TrueColor { r: 255, g: 0, b: 0 })
);
assert_eq!(
styled_string.bg,
Some(Color::TrueColor { r: 0, g: 0, b: 255 })
);
assert_eq!(styled_string.attrs, StyleAttributes::empty());
let styled_string = parse("red on blue+bold")?;
@ -65,19 +89,34 @@ mod parse_instruction {
// ##RRGGBB
let styled_string = parse("#FF0000 on #0000FF+bold")?;
assert_eq!(styled_string.fg, Some(Color::TrueColor { r: 255, g: 0, b: 0 }));
assert_eq!(styled_string.bg, Some(Color::TrueColor { r: 0, g: 0, b: 255 }));
assert_eq!(
styled_string.fg,
Some(Color::TrueColor { r: 255, g: 0, b: 0 })
);
assert_eq!(
styled_string.bg,
Some(Color::TrueColor { r: 0, g: 0, b: 255 })
);
assert_eq!(styled_string.attrs, StyleAttributes::BOLD);
let styled_string = parse("red on blue+bold|underline")?;
assert_eq!(styled_string.fg, Some(Color::Red));
assert_eq!(styled_string.bg, Some(Color::Blue));
assert_eq!(styled_string.attrs, StyleAttributes::BOLD | StyleAttributes::UNDERLINE);
assert_eq!(
styled_string.attrs,
StyleAttributes::BOLD | StyleAttributes::UNDERLINE
);
let styled_string = parse("red on #0000FF+bold|underline|italic")?;
assert_eq!(styled_string.fg, Some(Color::Red));
assert_eq!(styled_string.bg, Some(Color::TrueColor { r: 0, g: 0, b: 255 }));
assert_eq!(styled_string.attrs, StyleAttributes::BOLD | StyleAttributes::UNDERLINE | StyleAttributes::ITALIC);
assert_eq!(
styled_string.bg,
Some(Color::TrueColor { r: 0, g: 0, b: 255 })
);
assert_eq!(
styled_string.attrs,
StyleAttributes::BOLD | StyleAttributes::UNDERLINE | StyleAttributes::ITALIC
);
let styled_string = parse("+bold")?;
assert_eq!(styled_string.fg, None);

11
lib/logger/datetime.rs
View File

@ -33,7 +33,15 @@ pub fn utc_current_time() -> String {
let minutes = (secs / 60) % 60;
let seconds = secs % 60;
format!("{:04}-{:02}-{:02} {:02}:{:02}:{:02}", years, month + 1, day, hours, minutes, seconds)
format!(
"{:04}-{:02}-{:02} {:02}:{:02}:{:02}",
years,
month + 1,
day,
hours,
minutes,
seconds
)
}
Err(_) => "0".to_string(),
}
@ -57,4 +65,3 @@ fn days_to_date(days: u64, leap: bool) -> (u64, u64) {
(month, days_left + 1) // Adding 1 to day to make it 1-based
}

22
lib/logger/mod.rs
View File

@ -1,7 +1,9 @@
pub mod datetime;
use eyre::{eyre, Result};
use log::{Level, Metadata, Record};
use {
eyre::{eyre, Result},
log::{Level, Metadata, Record},
};
const RESET: &str = "\x1b[0m";
@ -34,28 +36,36 @@ impl StyledRecord {
Self {
level: format!("{}{:<5}{}", ansi_style_level, record.level(), RESET),
message: format!("{}", record.args()),
file: format!("{}{}{}", file_ansi_color, record.file().unwrap_or("unknown"), RESET),
file: format!(
"{}{}{}",
file_ansi_color,
record.file().unwrap_or("unknown"),
RESET
),
line: format!("{}{}{}", line_ansi_color, record.line().unwrap_or(0), RESET),
time,
}
}
}
pub struct ConsoleLogger<'a>{
pub struct ConsoleLogger<'a> {
context: &'a str,
time_fn: fn() -> String,
}
impl<'a> ConsoleLogger<'a> {
pub fn default_setup(max_level: Level, context: &'static str) -> Result<()> {
let logger = Box::new(ConsoleLogger { context, time_fn: datetime::utc_current_time});
let logger = Box::new(ConsoleLogger {
context,
time_fn: datetime::utc_current_time,
});
log::set_logger(Box::leak(logger) as &'static ConsoleLogger)
.map(|()| log::set_max_level(max_level.to_level_filter()))
.map_err(|err| eyre!("failed to set logger: {}", err))
}
pub fn setup(max_level: Level, context: &'static str, time_fn: fn() -> String) -> Result<()> {
let logger = Box::new(ConsoleLogger { context, time_fn});
let logger = Box::new(ConsoleLogger { context, time_fn });
log::set_logger(Box::leak(logger) as &'static ConsoleLogger)
.map(|()| log::set_max_level(max_level.to_level_filter()))
.map_err(|err| eyre!("failed to set logger: {}", err))