Auto merge of #2996 - Turbo87:dialoguer, r=jtgeibel

Use `dialoguer` crate for command line confirmations

This simplifies our command line confirmation code in the admin tools by using https://docs.rs/dialoguer.

r? `@jtgeibel`

Author: bors

Cargo.lock

@@ -49,6 +49,7 @@ conduit-static = "0.9.0-alpha.3"
 cookie = { version = "0.14", features = ["secure"] }
 ctrlc = { version = "3.0", features = ["termination"] }
 derive_deref = "1.1.1"
+dialoguer = "0.7.1"
 diesel = { version = "1.4.0", features = ["postgres", "serde_json", "chrono", "r2d2"] }
 diesel_full_text_search = "1.0.0"
 dotenv = "0.15"

Cargo.toml

@@ -1,11 +1,12 @@
 #![warn(clippy::all, rust_2018_idioms)]
 
 use cargo_registry::{db, models::Crate, schema::crates};
-use std::io::{self, prelude::*};
 
 use clap::Clap;
 use diesel::prelude::*;
 
+mod dialoguer;
+
 #[derive(Clap, Debug)]
 #[clap(
     name = "delete-crate",
@@ -29,14 +30,12 @@ fn delete(conn: &PgConnection) {
     let opts: Opts = Opts::parse();
 
     let krate: Crate = Crate::by_name(&opts.crate_name).first(conn).unwrap();
-    print!(
-        "Are you sure you want to delete {} ({}) [y/N]: ",
+
+    let prompt = format!(
+        "Are you sure you want to delete {} ({})?",
         opts.crate_name, krate.id
     );
-    io::stdout().flush().unwrap();
-    let mut line = String::new();
-    io::stdin().read_line(&mut line).unwrap();
-    if !line.starts_with('y') {
+    if !dialoguer::confirm(&prompt) {
         return;
     }
 
@@ -46,11 +45,7 @@ fn delete(conn: &PgConnection) {
         .unwrap();
     println!("  {} deleted", n);
 
-    print!("commit? [y/N]: ");
-    io::stdout().flush().unwrap();
-    let mut line = String::new();
-    io::stdin().read_line(&mut line).unwrap();
-    if !line.starts_with('y') {
+    if !dialoguer::confirm("commit?") {
         panic!("aborting transaction");
     }
 }

src/bin/delete-crate.rs

@@ -5,11 +5,12 @@ use cargo_registry::{
     models::{Crate, Version},
     schema::versions,
 };
-use std::io::{self, prelude::*};
 
 use clap::Clap;
 use diesel::prelude::*;
 
+mod dialoguer;
+
 #[derive(Clap, Debug)]
 #[clap(
     name = "delete-version",
@@ -39,14 +40,12 @@ fn delete(conn: &PgConnection) {
         .filter(versions::num.eq(&opts.version))
         .first(conn)
         .unwrap();
-    print!(
-        "Are you sure you want to delete {}#{} ({}) [y/N]: ",
+
+    let prompt = format!(
+        "Are you sure you want to delete {}#{} ({})?",
         opts.crate_name, opts.version, v.id
     );
-    io::stdout().flush().unwrap();
-    let mut line = String::new();
-    io::stdin().read_line(&mut line).unwrap();
-    if !line.starts_with('y') {
+    if !dialoguer::confirm(&prompt) {
         return;
     }
 
@@ -55,11 +54,7 @@ fn delete(conn: &PgConnection) {
         .execute(conn)
         .unwrap();
 
-    print!("commit? [y/N]: ");
-    io::stdout().flush().unwrap();
-    let mut line = String::new();
-    io::stdin().read_line(&mut line).unwrap();
-    if !line.starts_with('y') {
+    if !dialoguer::confirm("commit?") {
         panic!("aborting transaction");
     }
 }

src/bin/delete-version.rs

@@ -0,0 +1,32 @@
+use ::dialoguer::{theme::Theme, Confirm};
+
+pub fn confirm(msg: &str) -> bool {
+    Confirm::with_theme(&CustomTheme)
+        .with_prompt(msg)
+        .default(false)
+        .wait_for_newline(true)
+        .interact()
+        .unwrap()
+}
+
+#[derive(Debug, Copy, Clone)]
+pub struct CustomTheme;
+
+impl Theme for CustomTheme {
+    fn format_confirm_prompt(
+        &self,
+        f: &mut dyn std::fmt::Write,
+        prompt: &str,
+        default: Option<bool>,
+    ) -> std::fmt::Result {
+        if !prompt.is_empty() {
+            write!(f, "{} ", &prompt)?;
+        }
+        match default {
+            None => write!(f, "[y/n] ")?,
+            Some(true) => write!(f, "[Y/n] yes")?,
+            Some(false) => write!(f, "[y/N] no")?,
+        }
+        Ok(())
+    }
+}

src/bin/dialoguer/mod.rs

@@ -5,14 +5,13 @@ use cargo_registry::{
     models::{Crate, OwnerKind, User},
     schema::{crate_owners, crates, users},
 };
-use std::{
-    io::{self, prelude::*},
-    process::exit,
-};
+use std::process::exit;
 
 use clap::Clap;
 use diesel::prelude::*;
 
+mod dialoguer;
+
 #[derive(Clap, Debug)]
 #[clap(
     name = "transfer-crates",
@@ -59,11 +58,11 @@ fn transfer(conn: &PgConnection) {
         get_confirm("continue?");
     }
 
-    println!(
-        "Are you sure you want to transfer crates from {} to {}",
+    let prompt = format!(
+        "Are you sure you want to transfer crates from {} to {}?",
         from.gh_login, to.gh_login
     );
-    get_confirm("continue");
+    get_confirm(&prompt);
 
     let crate_owners = crate_owners::table
         .filter(crate_owners::owner_id.eq(from.id))
@@ -89,11 +88,7 @@ fn transfer(conn: &PgConnection) {
 }
 
 fn get_confirm(msg: &str) {
-    print!("{} [y/N]: ", msg);
-    io::stdout().flush().unwrap();
-    let mut line = String::new();
-    io::stdin().read_line(&mut line).unwrap();
-    if !line.starts_with('y') {
+    if !dialoguer::confirm(msg) {
         exit(0);
     }
 }