fix for --ascii-colors and --ascii-input #680
Conversation
| @@ -38,7 +38,6 @@ impl<W: Write> Printer<W> { | |||
| let center_pad = " ".repeat(CENTER_PAD_LENGTH); | |||
| let info_str = format!("{}", &self.info); | |||
| let mut info_lines = info_str.lines(); | |||
| let colors: Vec<DynColors> = Vec::new(); | |||
There was a problem hiding this comment.
You can get rid of use owo_colors::DynColors; which is now an unused import.
| @@ -62,7 +61,11 @@ impl<W: Write> Printer<W> { | |||
| ); | |||
| } else { | |||
| let mut logo_lines = if let Some(custom_ascii) = &self.info.config.ascii_input { | |||
| AsciiArt::new(custom_ascii, &colors, !self.info.config.no_bold) | |||
| AsciiArt::new( | |||
There was a problem hiding this comment.
This may be a little harder than that.
Indeed, self.info.ascii_colors's capacity is based on the dominant language definition (look here). As a result, depending on the dominant language, output may differ:
Example 1 (shell has only 1 color):
Example 2 (TypeScript has 2 colors):
Example 3 (c# has more than 3 colors):
There was a problem hiding this comment.
Thank you for your guidance. I'll put a WIP prefix until I've made the requested changes.
There was a problem hiding this comment.
This handles your example cases.
Still rather new to rust so any criticism on the approach taken would be much appreciated.
bitbrain-za
changed the title
bitbrain-za
changed the title
src/ui/mod.rs
Outdated
| @@ -18,18 +18,14 @@ pub fn get_ascii_colors( | |||
| dominant_language | |||
| }; | |||
|
|
|||
| let colors = language.get_colors(true_color); | |||
| let mut colors: Vec<DynColors> = ascii_colors.iter().map(|s| num_to_color(s)).collect(); | |||
There was a problem hiding this comment.
let mut language_colors: Vec<DynColors> = language.get_colors(true_color);
if ascii_colors.is_empty() {
language_colors
} else {
let mut colors: Vec<DynColors> = ascii_colors.iter().map(|s| num_to_color(s)).collect();
if language_colors.len() > colors.len() {
let mut missing = language_colors.drain(colors.len()..).collect();
colors.append(&mut missing);
}
colors
}minor: for better performance --> exit early when ascii_collors is empty.
There was a problem hiding this comment.
Thanks for the suggestion, I've added it.
|
Thanks a lot for you contribution @bitbrain-za It works great 🎉
|
use
self.info.ascii_colorsinstead of empty array.#552