bluh

Reviewed-on: gallant/theme-rs#1

Amazing stuff Karx! Sorry for the original messy code…

Cargo.lock

@@ -8,6 +8,55 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "anstream"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -44,18 +93,58 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
+[[package]]
+name = "cc"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "clap"
+version = "4.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed"
+dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "bitflags",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+
 [[package]]
 name = "color_quant"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
 [[package]]
 name = "crc32fast"
 version = "1.3.2"
@@ -120,6 +209,27 @@ version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
+[[package]]
+name = "errno"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "exr"
 version = "1.6.4"
@@ -221,6 +331,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
 [[package]]
 name = "image"
 version = "0.24.6"
@@ -240,6 +356,29 @@ dependencies = [
  "tiff",
 ]
 
+[[package]]
+name = "io-lifetimes"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi 0.3.1",
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+dependencies = [
+ "hermit-abi 0.3.1",
+ "io-lifetimes",
+ "rustix",
+ "windows-sys",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.6"
@@ -282,6 +421,12 @@ version = "0.2.146"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
 [[package]]
 name = "lock_api"
 version = "0.4.10"
@@ -362,7 +507,7 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.2.6",
  "libc",
 ]
 
@@ -463,6 +608,20 @@ dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.37.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.13"
@@ -527,6 +686,12 @@ dependencies = [
  "lock_api",
 ]
 
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
 [[package]]
 name = "syn"
 version = "2.0.18"
@@ -540,8 +705,9 @@ dependencies = [
 
 [[package]]
 name = "theme-rs"
-version = "0.1.0"
+version = "0.1.2"
 dependencies = [
+ "clap",
  "image",
  "json",
  "rgb",
@@ -566,6 +732,12 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -632,6 +804,72 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
 
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
 [[package]]
 name = "zune-inflate"
 version = "0.2.54"

Cargo.toml

@@ -1,11 +1,12 @@
 [package]
 name = "theme-rs"
-version = "0.1.0"
+version = "0.1.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+clap = "4.3.4"
 image = "0.24.6"
 json = "0.12.4"
 rgb = "0.8.36"

README.md

@@ -0,0 +1,13 @@
+The usage is pretty simple
+
+1. get a scheme from [terminal.sexy](https://terminal.sexy)
+2. get the image ever
+3. run `theme-rs -i <PATH/TO/IMAGE> -s <PATH/TO/SCHEME>`
+4. suck ess
+
+
+have fun!!
+
+
+
+credits to Daniel Seiler for his [ImageTheming](https://github.com/daniel-seiler/ImageTheming) project

aesthetic.json

@@ -0,0 +1,24 @@
+{
+  "name": "Aesthetic Night",
+  "author": "Gallant",
+  "color": [
+    "#1c252c",
+    "#df5b61",
+    "#78b892",
+    "#de8f78",
+    "#6791c9",
+    "#bc83e3",
+    "#67afc1",
+    "#d9d7d6",
+    "#484e5b",
+    "#f16269",
+    "#8cd7aa",
+    "#e9967e",
+    "#79aaeb",
+    "#c488ec",
+    "#7acfe4",
+    "#e5e5e5"
+  ],
+  "foreground": "#d9d7d6",
+  "background": "#061115"
+}

src/main.rs

@@ -3,6 +3,8 @@ use serde_json::Result;
 
 use image::{io::Reader as ImageReader, Rgb};
 
+use clap::{Arg, Command};
+
 #[derive(Serialize, Deserialize)]
 struct Scheme {
     name: String,
@@ -22,33 +24,34 @@ impl Scheme {
 }
 
 fn main() -> Result<()> {
-    let data = r##"{
-  "name": "",
-  "author": "",
-  "color": [
-    "#1c252c",
-    "#df5b61",
-    "#78b892",
-    "#de8f78",
-    "#6791c9",
-    "#bc83e3",
-    "#67afc1",
-    "#d9d7d6",
-    "#484e5b",
-    "#f16269",
-    "#8cd7aa",
-    "#e9967e",
-    "#79aaeb",
-    "#c488ec",
-    "#7acfe4",
-    "#e5e5e5"
-  ],
-  "foreground": "#d9d7d6",
-  "background": "#061115"
-}"##;
-    let scheme = Scheme::new(data.to_string())?;
+    let cmd = Command::new("theme")
+        .author("Gallant")
+        .version("0.1.2")
+        .about("Matches input image to color scheme")
+        .arg(
+            Arg::new("image")
+                .short('i')
+                .long("image")
+                .value_name("Path/to/image")
+                .help("The image to be processesed"),
+        )
+        .arg(
+            Arg::new("scheme")
+                .short('s')
+                .long("scheme")
+                .value_name("Path/to/scheme")
+                .help("The color scheme in JSON format to be used for processing"),
+        )
+        .get_matches();
 
-    let img = ImageReader::open("image.png").unwrap().decode().unwrap();
+    let scheme_data = cmd.get_one::<String>("scheme").unwrap();
+
+    let scheme = Scheme::new(std::fs::read_to_string(scheme_data).unwrap())?;
+
+    let img = ImageReader::open(cmd.get_one::<String>("image").unwrap())
+        .unwrap()
+        .decode()
+        .unwrap();
 
     let mut rgb_vals = img.to_rgb8();
     let img_height = rgb_vals.height();
@@ -72,9 +75,9 @@ fn main() -> Result<()> {
 }
 
 fn euclidean_distance(color1: (u8, u8, u8), color2: (u8, u8, u8)) -> f32 {
-    let (L1, a1, b1) = xyz_to_lab(rgb_to_xyz(color1));
-    let (L2, a2, b2) = xyz_to_lab(rgb_to_xyz(color2));
-    let squared_distance = (L2 - L1).powi(2) + (a2 - a1).powi(2) + (b2 - b1).powi(2);
+    let (l1, a1, b1) = xyz_to_lab(rgb_to_xyz(color1));
+    let (l2, a2, b2) = xyz_to_lab(rgb_to_xyz(color2));
+    let squared_distance = (l2 - l1).powi(2) + (a2 - a1).powi(2) + (b2 - b1).powi(2);
     squared_distance.sqrt()
 }
 
@@ -116,11 +119,11 @@ fn xyz_to_lab((x, y, z): (f32, f32, f32)) -> (f32, f32, f32) {
     let yn = 100.0;
     let zn = 108.8840;
 
-    let L = 116.0 * f(y / yn) - 16.0;
+    let l = 116.0 * f(y / yn) - 16.0;
     let a = 500.0 * (f(x / xn) - y / yn);
     let b = 200.0 * (f(y / yn) - f(z / zn));
 
-    (L, a, b)
+    (l, a, b)
 }
 
 fn hex_to_rgb(hex: &str) -> Option<(u8, u8, u8)> {