ID

31a74f0

date

2024-05-12 11:30:10+00:00

author

Alex Chan <alex@alexwlchan.net>

parent

b8f38e6

message

Pull colour printing into a function; print background color

changed files

2 files, 32 additions, 13 deletions

• src/cli.rs
• src/main.rs

Changed files

src/cli.rs (1309) → src/cli.rs (1384)

diff --git a/src/cli.rs b/src/cli.rs
index c4930c8..d1c0b87 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,4 +1,5 @@
 use clap::{Arg, ArgAction, Command};
+use palette::Srgb;
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
@@ -14,7 +15,7 @@ pub fn app() -> clap::Command {
                 .index(1),
         )
         .arg(
-            Arg::new("MAX-COLOURS")
+            Arg::new("MAX_COLOURS")
                 .long("max-colours")
                 .help("how many colours to find")
                 .value_parser(value_parser!(usize))
@@ -24,6 +25,7 @@ pub fn app() -> clap::Command {
             Arg::new("BACKGROUND_HEX")
                 .long("best-against-bg")
                 .help("find a single colour that will look best against this background")
+                .value_parser(value_parser!(Srgb<u8>)),
         )
         .arg(
             Arg::new("no-palette")

src/main.rs (7440) → src/main.rs (8057)

diff --git a/src/main.rs b/src/main.rs
index ff24d85..da04510 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,7 +3,7 @@
 #[macro_use]
 extern crate clap;
 
-use palette::Lab;
+use palette::{Lab, Srgb};
 
 mod cli;
 mod find_dominant_colors;
@@ -17,27 +17,44 @@ fn main() {
         .expect("`path` is required");
 
     let max_colours: usize = *matches
-        .get_one::<usize>("MAX-COLOURS")
+        .get_one::<usize>("MAX_COLOURS")
         .expect("`max-colours` is required");
 
     let lab: Vec<Lab> = get_image_colors::get_image_colors(&path);
 
     let dominant_colors = find_dominant_colors::find_dominant_colors(&lab, max_colours);
 
+    let background = matches.get_one::<Srgb<u8>>("BACKGROUND_HEX");
+
     // This uses ANSI escape sequences and Unicode block elements to print
     // a palette of hex strings which are coloured to match.
     // See https://alexwlchan.net/2021/04/coloured-squares/
     for c in dominant_colors {
-        let display_value = format!("#{:02x}{:02x}{:02x}", c.red, c.green, c.blue);
-
-        if matches.get_flag("no-palette") {
-            println!("{}", display_value);
-        } else {
-            println!(
-                "\x1B[38;2;{};{};{}m▇ {}\x1B[0m",
-                c.red, c.green, c.blue, display_value
-            );
-        }
+        print_color(c, &background, matches.get_flag("no-palette"));
+    }
+}
+
+// Print the colours to the terminal, using ANSI escape codes to
+// apply formatting if desired.
+//
+// Useful reading: https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797?permalink_comment_id=3857871
+fn print_color(c: Srgb<u8>, background: &Option<&Srgb<u8>>, no_palette: bool) {
+    let display_value = format!("#{:02x}{:02x}{:02x}", c.red, c.green, c.blue);
+
+    if no_palette {
+        println!("{}", display_value);
+    } else {
+        // If a background colour is specified, print it behind the
+        // hex strings.
+        match background {
+            Some(bg) => print!("\x1B[48;2;{};{};{}m", bg.red, bg.green, bg.blue),
+            _ => (),
+        };
+
+        println!(
+            "\x1B[38;2;{};{};{}m▇ {}\x1B[0m",
+            c.red, c.green, c.blue, display_value
+        );
     }
 }