From d9801cdf372521fe5624a8d68fac83ed39ef81f4 Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Thu, 4 Aug 2022 11:34:07 +0000 Subject: [PATCH] fix: dependencies update update colorize_logs with updated cansi methods --- src/ui/color_match.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ui/color_match.rs b/src/ui/color_match.rs index 14543b6..58fe50d 100644 --- a/src/ui/color_match.rs +++ b/src/ui/color_match.rs @@ -1,6 +1,6 @@ pub mod log_sanitizer { - use cansi::{categorise_text, Color as CansiColor, Intensity}; + use cansi::{v3::categorise_text, Color as CansiColor, Intensity}; use tui::{ style::{Color, Modifier, Style}, text::{Span, Spans}, @@ -12,25 +12,25 @@ pub mod log_sanitizer { categorise_text(&input) .into_iter() .map(|i| { - let fg_color = color_ansi_to_tui(i.fg_colour); - let bg_color = color_ansi_to_tui(i.bg_colour); + let fg_color = color_ansi_to_tui(i.fg.unwrap_or(CansiColor::White)); + let bg_color = color_ansi_to_tui(i.bg.unwrap_or(CansiColor::Black)); let style = Style::default().bg(bg_color).fg(fg_color); - if i.blink { + if i.blink.is_some() { style.add_modifier(Modifier::SLOW_BLINK); } - if i.underline { + if i.underline.is_some() { style.add_modifier(Modifier::UNDERLINED); } - if i.reversed { + if i.reversed.is_some() { style.add_modifier(Modifier::REVERSED); } - if i.intensity == Intensity::Bold { + if i.intensity == Some(Intensity::Bold) { style.add_modifier(Modifier::BOLD); } - if i.hidden { + if i.hidden.is_some() { style.add_modifier(Modifier::HIDDEN); } - if i.strikethrough { + if i.strikethrough.is_some() { style.add_modifier(Modifier::CROSSED_OUT); } Span::styled(i.text.to_owned(), style)