From e3fb4884b99db29948bc7395cd855e37bef49871 Mon Sep 17 00:00:00 2001 From: dandaedre Date: Wed, 28 Aug 2024 23:38:43 +0200 Subject: [PATCH] Works enough --- Palettes/Beach.png | Bin 0 -> 4097 bytes Palettes/Bender.png | Bin 0 -> 8496 bytes Palettes/GRBND.png | Bin 8486 -> 0 bytes Palettes/Great Green.png | Bin 0 -> 4569 bytes Palettes/Lochre.png | Bin 0 -> 3600 bytes Palettes/Red Haze.png | Bin 0 -> 3557 bytes src/main.rs | 188 +++++++++++++++++++++++++++++---------- 7 files changed, 139 insertions(+), 49 deletions(-) create mode 100644 Palettes/Beach.png create mode 100644 Palettes/Bender.png delete mode 100644 Palettes/GRBND.png create mode 100644 Palettes/Great Green.png create mode 100644 Palettes/Lochre.png create mode 100644 Palettes/Red Haze.png diff --git a/Palettes/Beach.png b/Palettes/Beach.png new file mode 100644 index 0000000000000000000000000000000000000000..7d40f5c31438ef8c7a9d99614de16220e1352f4f GIT binary patch literal 4097 zcmeAS@N?(olHy`uVBq!ia0y~yV1B{Cz%-kK4JeY9w7{N$fw3>s**U<|*;%2WC_gPT zCzXLgV`A;Zz21idM2`9gFLl-8)9NTW5g>b{NyCF(e04+%*TS$3uM$38;$P_LJn7LR zjU8e#F5>&y{xZ9Svxhqhh&Ud(cyqn0*B*V&Egr9%kNSmss#} z+e}Z@qfhU2NmMyY1b$KOXgQ;k95v}u#_oOc0uR30o!fis`_`DdS@)7098~5dw`B@X z?@%|-ZT>7+D6f4|>m%#O6`t%Wbx(Ia`l$YV(P^g{n`fRqBjDb7G)Y+7_l(yvHyc-( zVAHvOT1)#w&)uH0wP@jx^;(3^72%eA z)jX6=x9CB+|BnO|D$>GY6HV}maZpuem+`g*Vb@BFJQgpx$_$z zU-55vU|g`){F(NYe>_iqWrYX z9H5ZK#M+5_y$=V79QD8K)g2-eBJgs;LaPqeKmm5~)e$XR3&S?NO89h%f1#)Iq(_f5 zc8JNii0^0n%j^=)9_}b0;&|lZ&GoKcd-OTCc)V^t{`cvVdxxu^Gajm(nHiQLa-rn* znI)4R73I0|>{o1(_$A;Jk~Ymy*E4fV?0tTY4^{IY#J&9;wNB48-%vq8=)B?KEuG#+ zglBI%__Jfj^r7DbS;8!|zbN+OkIBUsQxy;0Jd>8zk$fa+W9L-0G}U0`c}jh& zXZig*wClLm^W1Y$J5T*7{v_@8`PU_-tBJP^mjoPRGm+RZp`C*@^q1aYx29EoU9CK& zs+za2*)gx{cPZ|AeKaFYO!U)~SoROwf6U$(Dk1-Q&Y~xGK0dOLZ+55;iv8|QO@1+Om|DppPt>e>RrRRP<{LV_I~n>Z^S0-WBtb8uu!RT{nnl3N6zQVaZmX7_M`A0*2DKo7MThZl>#G( zEy>&6h2cL4F4((#GEjuGz$3Dlfq`2Xgc%uT&5-~KvX^-Jy0X9EkP&5(elg?kEd~a8 zWltB!kcwMxZY~sTFc5KZoYZ+ZVbKeQ{zXhH1X%7WW-!RU`Z4pa(7C-kOLU5*85%xZ z%Qa_WV43C%G>(Bu7DxyH(+PvZ1x6s*$TuoTNq}&az{0b^fgKi}qk^CWMt*=eEMSId zXR!jB1P;$pL2v>iJ3t^=AFLgm^}*peDo9>{%m$`P2J*B5llEw+V-32|YKaC_GWn%2 zI66kPgIh@GH99!`j<{;c;rpf9xo3G81nz&Xb7N>YU^Ci|q<$NEG{<4haTE%U%nS=j zOVsweIVjPOxWbP%VF~IpVr>kK3W6F#6n0WZhc{?3-h;O3c9<>B(=K+mcg2QuEkh}ol1O^~D>>x=U z9H8K&J}L;#`{V=&Rf-M@OP=AUeYDu5tk}d_4UHC? literal 0 HcmV?d00001 diff --git a/Palettes/GRBND.png b/Palettes/GRBND.png deleted file mode 100644 index 89fed7f34cd1917f0768b4cab29b6c2ebeed41a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8486 zcmeAS@N?(olHy`uVBq!ia0y~yV1B{Cz_iqWrYX z9H5ZK#M+6r9)}%dj>bnXb=Bf36L>peq18=SSD9?lt^ma=Tx+dn#Qb9Qm6{|X?tXCV zg9pcxt{yxZ8O|Q=DDa1&u&f}cWTMdj=^{}_DhlrOmw%Tlf6q|A`Bcbeb;cF5Qd5FF z6{p9GHm&DK6lv}_q;42IU-+nr&GGBDH8p#?KkK|NuJ5Z`nqYK5T|j+CUc?dUBgV6* zovWO0ap=?}ry4(-#0#vQ@;mi*|2ekv$%gsqZaq0^^DLZnrtFG%mlS3e@+kAsj73>f z-k;yOrr_SAHDRyU)cXHBRNxpL`ONC9Mo`2NAs3Dbf$prK5gnITO-xd9{_V;CzvHp^ zN!7`#ncVtVuPksX`tzXv!|v$K7N#%NS|>Za@6N67VLTYS;Od6A?~`xm&1Gmzf8h1{ zN49Umx5;1J+`DBNnQtFBTIxRed&6njgdd*Mc}`AbGWmN{=|i2{{VD8id5!x_w{QPu z=O^EwQ#y4YBOhPmN1@d9)qAY3+`YX&{np>V3~8c83%@L4ss~03TavfC3&Vd9T(Ecf zWS|IVfk$L90|U1(2s1Lwnj--eWH0gbb!C6SAuV97`{cn6T?PhuWltB!kcwMxZY~sT zFc5KZoYZ+ZVbKeQ{zXhH1X%7WW-!RU`Z4pa(7C-kOLU5*85%xZ%Qa_WV43C%G>(Bu z7DxyHQwM{>1x6s*$TuoTNq}&az{0b^fgKi}qk^CWMt*=eEMSIdXR!jB1P;$pL2v>i zJ3t^=AFLgm^}*peDo9>{%m$`P2J*B5llEw+V-32|YKaC_GWn%2I66kPgIh@GH99!` zj<{;c;rpf9xo3G81nz&Xb7N>YU^Ci|q<$NEG{<4haTE%U%nS=jOVsweIVjPOxWbP% zVF~IpVr>kK3W6F#6n0WZhc{?3-h;O3c9<>B(=K+mcg2QuEkh}ol1O^~D>>x=U9H8K&J}L;#`{V=& zRf-M@OP=AUeYDu5tk}d_4UHC?~{bF diff --git a/Palettes/Great Green.png b/Palettes/Great Green.png new file mode 100644 index 0000000000000000000000000000000000000000..8189ed6e801ec8e28435bdfc347dd14d2d1324e5 GIT binary patch literal 4569 zcmeAS@N?(olHy`uVBq!ia0y~yV1B{C!1RuT4JcyUYvaqnz}T1R>>S|f?5t2wl%JNF zlghxLF|l^yUhl&JB1io%dv%A%gb2Kxu+XZ5HBf+Ee04+%*TS$3uM$38;$P_LJn7LR zjU8e#F5>&y{xZ9Svxhqhh&Ud(cyqn0*B*V&Egr9%kNREpO4(&Rw^*r}n)Xr0Xia$xaeg1Vx>1yIF!zBU7*i0lgOlap|4gIBe*sW=mUso$n zsjBAfYj(`*`dx~z$CzrCM);~TLF`&hs6H!M`DT)%Z^`H}Paa@-UCz5OWshxPEil0~KhMWw(9 zVoUONcVYMsf(!O8p9~b?EbxddW?xoocna-YCp%{e8bjsbhk|tTzdEFLlmE9%|OqD}LF2 zeLDk(&AYXN4FR=ldl_1;Eiz$B*&zfpTmYC}7#bYdfn*~ekl-j86{I9U92PLcw6j>j z!gEv*oWRHq5C$e$U{Hd!D_me?U;u~bs33U(G8-6_qhU$qbObI&!Dd2=QE-Aq7gV48 ztZ);PK-E1dWrl@W_krbb-;^E(Njp#xOh_+Q14jjM2Hj|tMvLm4>=GOj9i!Sott)72 zz#LeSL7H2m%>&As2S|yFsAAnuP4;#gtHPF=du|L)uT7*FIi}{Ovz)lw$q9>{(Y6J7 zZ3|%A7d`0k)Q6+h7tZR7P;+3kn?{3v>p+yl|2{J(nu)L8F1oiGn0FXFUHx3vIVCg! E0RO?}qyPW_ literal 0 HcmV?d00001 diff --git a/Palettes/Lochre.png b/Palettes/Lochre.png new file mode 100644 index 0000000000000000000000000000000000000000..34cdd8a3133824c91d032d26609996b238f8fb85 GIT binary patch literal 3600 zcmeAS@N?(olHy`uVBq!ia0y~yV1B{Cz+}w91{9gBYrKbnfw3>s**U<|*;%2WC_gPT zCzXLgV`A;Zz21idM2`Aj_UaCi2@!ZXVWCwAYoGwT`09uju7zP6UL}0G#J|wfdD5dt z8au>fT*UXY{bhCuXAgH25OF+m@#cD0uRZ#lTRdJjAOHLG$-TqX&lwL@&ddzU5V=rt z`^=I_kBahKdG;$dN&FIU3Q3!0sOy=zCH6i)$A_x<58~ebj#{T@ns2C}AavgF@Rm;R zBf_({9sJp`WBSyTsXv-3jx1po+Fum=@yF!ii>Zo-Zk|a?>qtJ5w6SxlTAFIG@;s%! z)wBHm9oltV>v`_EsGX<&6n~O-`~2&Y($&OUhD!pDv6)D0n9$C_8v0A`uv^nAzphrE zQdP~{*X)?r^}7^zy*`?eCMNo6N-X<_?LTI343&`oJZI69J0Ble$TvGwh_ARV^ZfaZ z!dL1JA0&5Nlm0Avs_;|ymni3Md8WH1=TFaWTlR)A+}h#)WX0K=v{^H`TbVx8xt*WN zT=lNuT&TYNe|taq#y4UU_OX8BZ&;{Qxqj=;@+0T-<+vyOd;3xN59{H3C5uc2ib{bI z#Fpgk?!xdN1Q+aGJ{c&&S>O>_%)r1c48n{Iv*t(u1=&kHeO=jKaL9?G*CF;BC9JPAD!4<}*kRlnYFnOml7pwRNfg`6D^hQ+VCG!1y zF8MI~UEIHt8*4wYaJ-B?+r!|v_4YLmfh!+h{pMe~$_Ho-1CuO}5CEnh289cZK(di< zRFIMY;V6NHXM+PfEIdaAK?#if0C8Br4AahH1vCj9o}+@`1V(m%K(anqJ2>lu!*f)S zr~rBFS-bsYTEmQU)29n6ta$kBXZs4d?xlhY0`x{pQtHs**U<|*;%2WC_gPT zCzXLgV`A;Zz21idM2`Aj_UaCi2@!ZXVWCwAYoGwT`09uju7zP6UL}0G#J|wfdD5dt z8au>fT*UXY{bhCuXAgH25OF+m@#cD0uRZ#lTRdJjAOHLG$-TqX&lwL@&ddzU5V=rt z`^=I_kBahKdG;$dN&FIU3Q3!0sOy=zCH6i)$A_x<58~ebj#{T@ns2C}AavgF@Rm;R zBf_({9sJp`WBSyTsXv-3jx1po+Fum=@yF!ii>Zo-Zk|a?>qtJ5w6SxlTAFIG@;s%! z)wBHm9oltV>v`_EsGX<&6n~O-`~2&Y($&OUhD!pDv6)D0n9$C_8v0A`uv^nAzphrE zQdP~{*X)?r^}7^zy*`?eCMNo6N-X<_?LTI343&`oJZI69J0Ble$TvGwh_ARV^ZfaZ z!dL1JA0&5Nlm0Avs_;|ymni3Md8WH1=TFaWTlR)A+}h#)WX0K=v{^H`TbVx8xt*WN zT=lNuT&TYNe|taq#y4UU_OX8BZ&;{Qxqj=;@+0T-<+vyOd;3xN59{H3C5uc2ib{bI z#Fpgk?!xdN1Q+aGJ{c&&S>O>_%)r1c48n{Iv*t(u1=&kHeO=jKaL9>grSiSrdf&QttZ6X;JUhK(JW?%`8&1Y$7VIM7+VTCC5YAW)}AqtDJ;jEqHatKsUjuzqA li*Pky*gzT$gF1u`xa%7q=jXcaYV#lDU{6;+mvv4FO#nW1Xukje literal 0 HcmV?d00001 diff --git a/src/main.rs b/src/main.rs index fb784be..4c8229b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -use clap::{Parser, ValueEnum}; +use clap::Parser; use palette::{FromColor, Hsl, Srgb}; use std::fs::File; use std::io::Write; @@ -13,39 +13,149 @@ use std::path::Path; #[command(author, version, about, long_about = None)] struct Cli { /// Path of the image to extract the palette from - #[arg(short, long, value_name = "IMAGE_PATH")] - image: PathBuf, + #[arg(value_name = "IMAGE_PATH")] + image: Vec, /// Path to export the palette to #[arg(short, long, value_name = "EXPORT_PATH")] export: Option, - - /// Format in which to export the palette (e.g., JSON, XML) - #[arg(short, long, value_enum, value_name = "FORMAT")] - format: Option, + // /// Format in which to export the palette (e.g., JSON, XML) + // #[arg(short, long, value_enum, value_name = "FORMAT")] + // format: Option, } -/// Supported export formats for the color palette -#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, ValueEnum)] -enum PaletteFormat { - HTML, - Md, +// /// Supported export formats for the color palette +// #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, ValueEnum)] +// enum PaletteFormat { +// HTML, +// Md, +// } + +/// A color index +struct ColorIndex { + name: String, + colors: Vec, +} + +impl ColorIndex { + fn new(name: String, colors: Vec) -> Self { + Self { name, colors } + } +} + +/// A single color, with many infos +struct RichColor { + #[allow(dead_code)] + hue: u32, + luma: u32, + rgb: (u8, u8, u8), +} + +impl RichColor { + fn rgb_string(&self) -> String { + format!("#{:02X}{:02X}{:02X}", self.rgb.0, self.rgb.1, self.rgb.2) + } +} + +impl RichColor { + fn new(hue: u32, luma: u32, rgb: (u8, u8, u8)) -> Self { + Self { hue, luma, rgb } + } } fn main() { let cli = Cli::parse(); let export_path = match cli.export { Some(e) => e, - None => cli.image.as_path().with_extension("html"), + None => cli.image[0] + .parent() + .expect("Couldn't find a place to save the output") + .to_path_buf(), }; // Display parsed arguments println!("[INFO] Image Path: {:?}", &cli.image); println!("[INFO] Export Path: {:?}", &export_path); - println!("[INFO] Export Format: {:?}", &cli.format); + // println!("[INFO] Export Format: {:?}", &cli.format); - let image_path = cli.image; + let mut colorblobs = Vec::with_capacity(cli.image.len()); + for image in cli.image { + colorblobs.push(extract_colors(&image)); + } + export(export_path, colorblobs); +} +fn export(export_path: PathBuf, color_vec: Vec) { + let mut out = File::create(&export_path).expect("Can't open output file"); + + write!( + out, + r#""# + ).unwrap(); + write!( + out, + "Palette: {}", + &export_path + .file_name() + .unwrap() + .to_str() + .unwrap() + .split(".") + .nth(0) + .unwrap() + ) + .unwrap(); + write!( + out, + r#" + "# + ) + .unwrap(); + for blob in color_vec { + write!(out, "

{}

", blob.name).unwrap(); + write!(out, "
").unwrap(); + for v in blob.colors { + let c = if v.luma < 60 { "FFFFFF" } else { "000000" }; + write!(out,"
\n {} \n
",v.rgb_string(),c,v.rgb_string()).expect("Can't write color in the output"); + } + write!(out, "
").unwrap(); + } + write!(out, "").unwrap(); +} + +fn extract_colors(image_path: &PathBuf) -> ColorIndex { + let name = format!( + "{}", + image_path + .file_name() + .unwrap() + .to_str() + .unwrap() + .split(".") + .nth(0) + .unwrap() + ); // Open the image let img = image::open(&Path::new(&image_path)).expect("Failed to open image"); @@ -68,48 +178,28 @@ fn main() { rgb[1], rgb[2], (hsl.hue.into_positive_degrees() * 100.) as u32, + (hsl.lightness * 100.) as u32, )); } let mut vec = Vec::with_capacity(colors.len() + 1); // Print the unique colors for color in &colors { - println!("Color: {:?}", color); + println!("[{}] {:?}", name, color); - vec.push(format!("#{:02X}{:02X}{:02X}", color.0, color.1, color.2)); + vec.push(( + color.3, // format!("#{:02X}{:02X}{:02X}", color.0, color.1, color.2), + (color.0, color.1, color.2), + color.4, + )); } - println!("Found {} unique colors", colors.len()); - - let mut out = File::create(&export_path).expect("Can't open output file"); - - write!( - out, - r#""# - ).unwrap(); - write!(out, "{:?}", &export_path.file_name()).unwrap(); - write!( - out, - r#"
"# + vec.sort_by_key(|&(k, _, _)| k); + println!("[{}] Found {} unique colors", name, colors.len()); + ColorIndex::new( + name, + vec.iter() + .map(|(hue, rgb, luma)| RichColor::new(*hue, *luma, rgb.to_owned())) + .collect(), ) - .unwrap(); - for v in vec { - write!(out,"
\n {} \n
",v,v).expect("Can't write color in the output"); - } - write!(out, "").unwrap(); }