Use Crate for Color Assignment

Author: jabbate19

Cargo.lock

@@ -12,6 +12,7 @@ serde_json = "1.0.71"
 serde = "1.0.130"
 ncurses = "5.101.0"
 http = "0.2.5"
+term = "*"
 
 [dependencies.isahc]
 version = "1.6.0"

Cargo.toml

@@ -1,19 +1,16 @@
 use clap::ArgMatches;
 use isahc::{HttpClient, ReadResponseExt, Request};
-
+use std::io::prelude::*;
 use serde_json::{Map, Value};
 
 use crate::api::APIError;
 use crate::api::API;
 
-static RST: &'static str = "\x1B[0m";
-static CYAN: &'static str = "\x1B[36m";
-static WHITE: &'static str = "\x1B[37m";
-static RED: &'static str = "\x1B[31m";
-
 pub fn list(matches: &ArgMatches<'_>, api: &mut API) -> Result<(), Box<dyn std::error::Error>> {
   let token = api.get_token()?;
 
+  let mut term = term::stdout().unwrap();
+
   let client = HttpClient::new()?;
   let mut url = "https://drink.csh.rit.edu/drinks".to_string();
   if let Some(machine) = matches.value_of("machine") {
@@ -51,8 +48,9 @@ pub fn list(matches: &ArgMatches<'_>, api: &mut API) -> Result<(), Box<dyn std::
       None => return Err(Box::new(APIError::BadFormat)),
     };
     let subject_line = format!("{} ({})", display_name, name);
-    println!("{}{}{}", &CYAN, &subject_line, &RST);
-    println!("{}{}{}", &CYAN, "=".repeat(subject_line.len()), &RST);
+    term.fg(term::color::CYAN).unwrap();
+    writeln!(term, "{}", subject_line).unwrap();
+    writeln!(term, "{}", "=".repeat(subject_line.len())).unwrap();
     let slots: &Vec<Value> = match machine["slots"].as_array() {
       Some(slots) => slots,
       None => return Err(Box::new(APIError::BadFormat)),
@@ -72,10 +70,13 @@ pub fn list(matches: &ArgMatches<'_>, api: &mut API) -> Result<(), Box<dyn std::
       let slot_number = slot["number"].as_u64().unwrap();
       let name = item["name"].as_str().unwrap();
       if slot["empty"].as_bool().unwrap() {
-        print!("{}{}. {} ({} Credits) [EMPTY]{}", &RED, slot_number, name, price, &RST)
+        term.fg(term::color::RED).unwrap();
+        write!(term, "{}. {} ({} Credits) [EMPTY]", slot_number, name, price).unwrap();
       } else {
-        print!("{}. {} ({} Credits)", slot_number, name, price)
+        term.fg(term::color::WHITE).unwrap();
+        write!(term, "{}. {} ({} Credits)", slot_number, name, price).unwrap();
       }
+      term.reset().unwrap();
       println!("");
     }
     println!("");