Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-11-19 10:45:11 +00:00
Code Issues Projects Releases Wiki Activity

More ls_colors parsing

Browse Source
This commit is contained in:
Benjamin Sago 2017-08-22 18:06:42 +01:00
parent 5e0003784d
commit 8b0e483c0f
1 changed files with 104 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
src/output/lsc.rs
View File

@ -1,3 +1,5 @@
#![allow(dead_code)]
use std::collections::HashMap; use std::collections::HashMap;
use ansi_term::Style; use ansi_term::Style;
@ -5,7 +7,7 @@ use ansi_term::Colour::*;
pub struct LSColors<'var> { pub struct LSColors<'var> {
contents: HashMap<&'var str, &'var str> contents: HashMap<&'var str, &'var str>
} }
impl<'var> LSColors<'var> { impl<'var> LSColors<'var> {
@ -17,23 +19,83 @@ impl<'var> LSColors<'var> {
.take(3) .take(3)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
if bits.len() == 2 { Some((bits[0], bits[1])) } if bits.len() != 2 || bits[0].is_empty() || bits[1].is_empty() { None }
else { None } else { Some( (bits[0], bits[1]) ) }
}).collect(); }).collect();
LSColors { contents } LSColors { contents }
} }
fn get(&self, facet_name: &str) -> Option<Style> { fn get(&self, facet_name: &str) -> Option<Style> {
self.contents.get(facet_name).and_then(ansi_to_style) self.contents.get(facet_name).map(ansi_to_style)
} }
} }
fn ansi_to_style(ansi: &&str) -> Option<Style> { fn ansi_to_style(ansi: &&str) -> Style {
match *ansi { let mut style = Style::default();
"31" => Some(Red.normal()),
"34" => Some(Blue.normal()), for num in ansi.split(";") {
_ => None, match num {
// Bold and italic
"1" => style = style.bold(),
"4" => style = style.underline(),
// Foreground colours
"30" => style = style.fg(Black),
"31" => style = style.fg(Red),
"32" => style = style.fg(Green),
"33" => style = style.fg(Yellow),
"34" => style = style.fg(Blue),
"35" => style = style.fg(Purple),
"36" => style = style.fg(Cyan),
"37" => style = style.fg(White),
// Background colours
"40" => style = style.on(Black),
"41" => style = style.on(Red),
"42" => style = style.on(Green),
"43" => style = style.on(Yellow),
"44" => style = style.on(Blue),
"45" => style = style.on(Purple),
"46" => style = style.on(Cyan),
"47" => style = style.on(White),
_ => {/* ignore the error and do nothing */},
}
} }
style
}
#[cfg(test)]
mod ansi_test {
use super::*;
use ansi_term::Style;
macro_rules! test {
($name:ident: $input:expr => $result:expr) => {
#[test]
fn $name() {
assert_eq!(ansi_to_style(&$input), $result);
}
};
}
// Styles
test!(bold: "1" => Style::default().bold());
test!(under: "4" => Style::default().underline());
test!(both: "1;4" => Style::default().bold().underline());
test!(fg: "31" => Red.normal());
test!(bg: "43" => Style::default().on(Yellow));
test!(bfg: "31;43" => Red.on(Yellow));
test!(all: "43;31;1;4" => Red.on(Yellow).bold().underline());
test!(again: "1;1;1;1;1" => Style::default().bold());
// Failure cases
test!(empty: "" => Style::default());
test!(semis: ";;;;;;" => Style::default());
test!(nines: "99999999" => Style::default());
test!(word: "GREEN" => Style::default());
} }
@ -42,59 +104,45 @@ fn ansi_to_style(ansi: &&str) -> Option<Style> {
mod test { mod test {
use super::*; use super::*;
#[test] macro_rules! test {
fn parse_empty() { ($name:ident: $input:expr, $facet:expr => $result:expr) => {
let lsc = LSColors::parse(""); #[test]
assert_eq!(lsc.get("di"), None); fn $name() {
assert_eq!(lsc.get(""), None); let lsc = LSColors::parse($input);
assert_eq!(lsc.get($facet), $result.into());
assert_eq!(lsc.get(""), None);
}
};
} }
#[test] // Bad parses
fn parse_gibberish() { test!(empty: "", "di" => None);
let lsc = LSColors::parse("gibberish"); test!(jibber: "blah", "di" => None);
assert_eq!(lsc.get("di"), None);
assert_eq!(lsc.get("gibberish"), None);
}
test!(equals: "=", "di" => None);
test!(starts: "=di", "di" => None);
test!(ends: "id=", "id" => None);
#[test] // Foreground colours
fn parse_one() { test!(red: "di=31", "di" => Red.normal());
let lsc = LSColors::parse("di=34"); test!(green: "cb=32", "cb" => Green.normal());
assert_eq!(lsc.get("di"), Some(Blue.normal())); test!(blue: "la=34", "la" => Blue.normal());
assert_eq!(lsc.get("ln"), None);
}
#[test]
fn parse_and_ignore_one() {
let lsc = LSColors::parse("di=34=56");
assert_eq!(lsc.get("di"), None);
}
#[test] // Background colours
fn parse_and_ignore_again() { test!(yellow: "do=43", "do" => Style::default().on(Yellow));
let lsc = LSColors::parse("di="); test!(purple: "re=45", "re" => Style::default().on(Purple));
assert_eq!(lsc.get("di"), None); test!(cyan: "mi=46", "mi" => Style::default().on(Cyan));
}
#[test]
fn parse_and_ignore_other() {
let lsc = LSColors::parse("=id");
assert_eq!(lsc.get("di"), None);
}
// Bold and underline
test!(bold: "fa=1", "fa" => Style::default().bold());
test!(under: "so=4", "so" => Style::default().underline());
test!(both: "la=1;4", "la" => Style::default().bold().underline());
#[test] // More and many
fn parse_and_ignore_equals() { test!(more_1: "me=43;21;55;34:yu=1;4;1", "me" => Blue.on(Yellow));
let lsc = LSColors::parse("="); test!(more_2: "me=43;21;55;34:yu=1;4;1", "yu" => Style::default().bold().underline());
assert_eq!(lsc.get("di"), None);
}
test!(many_1: "red=31:green=32:blue=34", "red" => Red.normal());
#[test] test!(many_2: "red=31:green=32:blue=34", "green" => Green.normal());
fn parse_two() { test!(many_3: "red=31:green=32:blue=34", "blue" => Blue.normal());
let lsc = LSColors::parse("di=34:ln=31");
assert_eq!(lsc.get("di"), Some(Blue.normal()));
assert_eq!(lsc.get("ln"), Some(Red.normal()));
assert_eq!(lsc.get("cd"), None);
}
} }