Merge branch 'master' into master

Author: jabbate19

Cargo.lock

@@ -1,20 +1,18 @@
 [package]
 name = "clink"
-version = "0.1.0"
+authors = ["Mary Strodl <[email protected]>", "Willard Nilges <[email protected]>"]
+version = "0.1.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "2.33.3"
 url = "2.2.2"
 serde_json = "1.0.71"
 serde = "1.0.130"
 ncurses = "5.101.0"
 http = "0.2.5"
 rpassword = "5.0"
 users = "0.11.0"
-
-[dependencies.isahc]
-version = "1.6.0"
-features = ["json", "spnego"]
+clap = { version = "3.1.6", features = ["cargo"] }
+isahc = { version = "1.6.0", features = ["json", "spnego"] }

Cargo.toml

@@ -0,0 +1,28 @@
+# Clink
+
+Clink is a command line interface for ordering drinks from any of the vending machines on floor.
+
+It comes with a command line that can be used to list and purchase drinks.
+
+![image](https://user-images.githubusercontent.com/42927786/157095410-d208a41d-adcb-4991-b9c1-3e7a8ed38f8f.png)
+
+Or, if you prefer a more graphical experience, you can use the ncurses UI.
+
+![image](https://user-images.githubusercontent.com/42927786/157095299-7c97a0a0-9bb7-4366-ba4f-94324189b950.png)
+
+## Usage
+
+To use clink, simply...
+
+1. Log onto any user machine
+2. Run `kinit` to get a kerberos token 
+3. Run `clink`
+
+![output2](https://user-images.githubusercontent.com/42927786/157098855-302db1ed-13b8-4be5-b1bf-4431ea83e92f.gif)
+
+## Development
+```
+git clone [email protected]/computersciencehouse/clink
+cd clink
+cargo build
+```

README.md

@@ -2,7 +2,7 @@ use clap::ArgMatches;
 
 use crate::api::API;
 
-pub fn drop(matches: &ArgMatches<'_>, api: &mut API) -> Result<(), Box<dyn std::error::Error>> {
+pub fn drop(matches: &ArgMatches, api: &mut API) -> Result<(), Box<dyn std::error::Error>> {
   // We can unwrap these because they're required arguments:
   let machine = matches.value_of("machine").unwrap();
   let slot = matches.value_of("slot").unwrap();

src/commands/drop.rs

@@ -6,7 +6,7 @@ use serde_json::{Map, Value};
 use crate::api::APIError;
 use crate::api::API;
 
-pub fn list(matches: &ArgMatches<'_>, api: &mut API) -> Result<(), Box<dyn std::error::Error>> {
+pub fn list(matches: &ArgMatches, api: &mut API) -> Result<(), Box<dyn std::error::Error>> {
   let token = api.get_token()?;
 
   let client = HttpClient::new()?;

src/commands/list.rs

@@ -1,36 +1,34 @@
-use clap::{App, Arg, ArgMatches, SubCommand};
+use clap::{command, Arg, ArgMatches, Command};
 
 pub mod api;
 pub mod commands;
 
 mod ui;
 
 fn main() {
-  let matches = App::new("CLI Drink")
-    .version("1.0.0")
-    .author("Mary Strodl <[email protected]>")
+  let matches = command!("CLI Drink")
     .about("Drops drinks from CSH vending machines")
     .subcommand(
-      SubCommand::with_name("list")
+      Command::new("list")
         .about("Display available slots")
         .arg(
-          Arg::with_name("machine")
+          Arg::new("machine")
             .index(1)
             .help("Which machine should be listed?")
             .required(false),
         ),
     )
     .subcommand(
-      SubCommand::with_name("drop")
+      Command::new("drop")
         .about("Drops a drink")
         .arg(
-          Arg::with_name("machine")
+          Arg::new("machine")
             .index(1)
             .help("Machine to drop from")
             .required(true),
         )
         .arg(
-          Arg::with_name("slot")
+          Arg::new("slot")
             .index(2)
             .help("Slot to drop from")
             .required(true),
@@ -50,16 +48,20 @@ fn process_command(matches: ArgMatches) -> Result<(), Box<dyn std::error::Error>
   } else if let Some(matches) = matches.subcommand_matches("drop") {
     return commands::drop::drop(matches, &mut api);
   } else {
-    cli();
+    cli(&mut api);
     return Ok(());
   }
 }
 
-fn cli() {
-
-  let mut api = api::API::new(); // Cheetos.
-
+fn cli(api: &mut api::API) {
   ui::ui_common::launch();
-  ui::machine::pick_machine(&mut api);
-  ui::ui_common::end();
+  let task = match ui::machine::pick_machine(api) {
+    Ok(_) => {
+      ui::ui_common::end();
+    }
+    Err(err) => {
+      ui::ui_common::end();
+      eprintln!("{}", err);
+    }
+  };
 }

src/main.rs

@@ -2,9 +2,10 @@ use ncurses::*;
 use crate::ui::inventory;
 use crate::ui::ui_common;
 use serde_json::{Map, Value};
+use crate::api::APIError;
 use crate::api;
 
-pub fn pick_machine(api: &mut api::API) {
+pub fn pick_machine(api: &mut api::API) -> Result<(), Box<dyn std::error::Error>> {
   /* Get the screen bounds. */
   let mut max_x = 0;
   let mut max_y = 0;
@@ -27,8 +28,14 @@ pub fn pick_machine(api: &mut api::API) {
   mvwprintw(win, 1, 2, "SELECT A MACHINE");
   mvwprintw(win, 2, 2, "================");
 
-  let mut credits = api::API::get_credits(api);
-  mvwprintw(win, height - 2, width - 20, format!("Credits: {}", credits.unwrap()).as_str());
+  let mut credits = match api::API::get_credits(api) {
+    Ok(credits) => credits,
+    Err(err) => {
+        eprintln!("{}", err);
+        return Err(Box::new(APIError::Unauthorized));
+    }
+  };
+  mvwprintw(win, height - 2, width - 20, format!("Credits: {}", credits).as_str());
 
   let machine_status = match api::API::get_machine_status(api) {
       Ok(status) => {
@@ -74,10 +81,16 @@ pub fn pick_machine(api: &mut api::API) {
             KEY_RIGHT => {
                 inventory::build_menu(api, &machine_status, selected_machine);
                 // Refresh credits in case we bought anything.
-                credits = api::API::get_credits(api);
+                credits = match api::API::get_credits(api) {
+                    Ok(credits) => credits,
+                    Err(err) => {
+                        eprintln!("{}", err);
+                        return Err(Box::new(APIError::Unauthorized));
+                    }
+                  };
                 wmove(win, height-2, width-20);
                 wclrtoeol(win);
-                mvwprintw(win, height-2, width-20, format!("Credits: {}", credits.unwrap()).as_str());
+                mvwprintw(win, height-2, width-20, format!("Credits: {}", credits).as_str());
                 box_(win, 0, 0);
                 refresh();
                 wrefresh(win);
@@ -104,6 +117,7 @@ pub fn pick_machine(api: &mut api::API) {
         key = getch(); 
       }
       ui_common::destroy_win(win);
+      Ok(())
     }
     _ => {
       endwin();