From b3935935cb5228e480e483844f86f3b94e093bfa Mon Sep 17 00:00:00 2001 From: cetra3 Date: Mon, 26 Sep 2016 12:12:46 +0930 Subject: [PATCH] Add colour choice --- src/printer.rs | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/src/printer.rs b/src/printer.rs index 84a72fba..4b20a1a6 100644 --- a/src/printer.rs +++ b/src/printer.rs @@ -37,6 +37,36 @@ pub struct Printer { replace: Option>, /// Whether to prefix each match with the corresponding file name. with_filename: bool, + + /// The choice of Colours + color_choice: ColorChoice +} + +struct ColorChoice { + matched_line: color::Color, + heading: color::Color, + line_number: color::Color +} + +impl ColorChoice { + + #[cfg(unix)] + pub fn new() -> ColorChoice { + ColorChoice { + matched_line: color::RED, + heading: color::GREEN, + line_number: color::BLUE + } + } + + #[cfg(not(unix))] + pub fn new() -> ColorChoice { + ColorChoice { + matched_line: color::BRIGHT_RED, + heading: color::BRIGHT_GREEN, + line_number: color::BRIGHT_BLUE + } + } } impl Printer { @@ -53,6 +83,7 @@ impl Printer { quiet: false, replace: None, with_filename: false, + color_choice: ColorChoice::new() } } @@ -243,7 +274,7 @@ impl Printer { let mut last_written = 0; for (s, e) in re.find_iter(buf) { self.write(&buf[last_written..s]); - let _ = self.wtr.fg(color::BRIGHT_RED); + let _ = self.wtr.fg(self.color_choice.matched_line); let _ = self.wtr.attr(Attr::Bold); self.write(&buf[s..e]); let _ = self.wtr.reset(); @@ -277,7 +308,7 @@ impl Printer { fn write_heading>(&mut self, path: P) { if self.wtr.supports_color() { - let _ = self.wtr.fg(color::BRIGHT_GREEN); + let _ = self.wtr.fg(self.color_choice.heading); let _ = self.wtr.attr(Attr::Bold); } self.write_path(path.as_ref()); @@ -289,7 +320,7 @@ impl Printer { fn line_number(&mut self, n: u64, sep: u8) { if self.wtr.supports_color() { - let _ = self.wtr.fg(color::BRIGHT_BLUE); + let _ = self.wtr.fg(self.color_choice.line_number); let _ = self.wtr.attr(Attr::Bold); } self.write(n.to_string().as_bytes());