CLI-1264: add ok and err

bohutang · bohutang · commit e4156e3cb6f5 · 2021-08-03T17:49:40.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/fusecli/cli/Cargo.toml b/fusecli/cli/Cargo.toml
@@ -19,6 +19,7 @@ path = "src/bin/datafuse-cli.rs"
 # Crates.io dependencies
 ansi_term = "0.12.1"
 clap = "2.33.3"
+colored = "2.0.0"
 dirs = "3.0.2"
 dyn-clone = "1.0.4"
 flate2 = "1.0.20"
diff --git a/fusecli/cli/src/cmds/gets/get.rs b/fusecli/cli/src/cmds/gets/get.rs
@@ -92,10 +92,10 @@ impl Command for GetCommand {
         {
             Ok(_matches) => {
                 let arch = self.get_architecture()?;
-                writer.writeln("Arch", arch.as_str());
+                writer.write_ok(format!("Arch {}", arch).as_str());
 
                 let latest_tag = self.get_latest_tag()?;
-                writer.writeln("Tag", latest_tag.as_str());
+                writer.write_ok(format!("Tag {}", latest_tag).as_str());
 
                 // Create download dir.
                 let bin_download_dir = format!(
@@ -112,7 +112,6 @@ impl Command for GetCommand {
 
                 let bin_name = format!("datafuse--{}.tar.gz", arch);
                 let bin_file = format!("{}/{}", bin_download_dir, bin_name);
-                writer.writeln("Binary", bin_file.as_str());
                 let exists = Path::new(bin_file.as_str()).exists();
 
                 // Download.
@@ -123,7 +122,6 @@ impl Command for GetCommand {
                         latest_tag,
                         bin_name,
                     );
-                    writer.writeln("Download", binary_url.as_str());
                     let res = ureq::get(binary_url.as_str()).call()?;
                     let total_size: u64 = res.header("content-length").unwrap().parse().unwrap();
                     let pb = ProgressBar::new(total_size);
@@ -133,22 +131,33 @@ impl Command for GetCommand {
 
                     let mut out = File::create(bin_file.clone()).unwrap();
                     io::copy(&mut pb.wrap_read(res.into_reader()), &mut out).unwrap();
+                    writer.write_ok(format!("Download {}", binary_url).as_str());
                 }
+                writer.write_ok(format!("Binary {}", bin_file).as_str());
 
                 // Unpack.
                 let tar_gz = File::open(bin_file)?;
                 let tar = GzDecoder::new(tar_gz);
                 let mut archive = Archive::new(tar);
-                writer.writeln("Unpack to", bin_unpack_dir.as_str());
-                archive.unpack(bin_unpack_dir).unwrap();
+                let res = archive.unpack(bin_unpack_dir.clone());
+                match res {
+                    Ok(_) => {
+                        writer.write_ok(format!("Unpack {}", bin_unpack_dir).as_str());
+                    }
+                    Err(e) => {
+                        writer.write_err(format!("{}", e).as_str());
+                        return Ok(());
+                    }
+                };
 
                 // Write status.
                 let mut status = Status::read(self.conf.clone())?;
                 status.latest = latest_tag;
                 status.write()?;
+                writer.write_ok("Write status");
             }
             Err(err) => {
-                writer.writeln_width("", format!("{}", err).as_str(), 0);
+                writer.write_err(format!("{}", err).as_str());
             }
         }
 
diff --git a/fusecli/cli/src/cmds/writer.rs b/fusecli/cli/src/cmds/writer.rs
@@ -5,6 +5,8 @@
 use std::io::Stdout;
 use std::io::Write;
 
+use colored::Colorize;
+
 enum WriterOutput {
     Stdout(Stdout),
 }
@@ -25,9 +27,12 @@ impl Writer {
         writeln!(self, "{:width$} {}", name, value, width = width).unwrap();
     }
 
-    pub fn writeln_width(&mut self, name: &str, value: &str, width: usize) {
-        let width = width;
-        writeln!(self, "{:width$} {}", name, value, width = width).unwrap();
+    pub fn write_ok(&mut self, msg: &str) {
+        writeln!(self, "✅ {} {}", "[ok]".bold().green(), msg).unwrap();
+    }
+
+    pub fn write_err(&mut self, msg: &str) {
+        writeln!(self, "{} {}", "[failed]".bold().red(), msg.red()).unwrap();
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`use std::io::Stdout;`
`6`	`6`	`use std::io::Write;`
`7`	`7`
	`8`	`+use colored::Colorize;`
	`9`	`+`
`8`	`10`	`enum WriterOutput {`
`9`	`11`	`Stdout(Stdout),`
`10`	`12`	`}`
`@@ -25,9 +27,12 @@ impl Writer {`
`25`	`27`	`writeln!(self, "{:width$} {}", name, value, width = width).unwrap();`
`26`	`28`	`}`
`27`	`29`
`28`		`- pub fn writeln_width(&mut self, name: &str, value: &str, width: usize) {`
`29`		`- let width = width;`
`30`		`- writeln!(self, "{:width$} {}", name, value, width = width).unwrap();`
	`30`	`+ pub fn write_ok(&mut self, msg: &str) {`
	`31`	`+ writeln!(self, "✅ {} {}", "[ok]".bold().green(), msg).unwrap();`
	`32`	`+ }`
	`33`	`+`
	`34`	`+ pub fn write_err(&mut self, msg: &str) {`
	`35`	`+ writeln!(self, "{} {}", "[failed]".bold().red(), msg.red()).unwrap();`
`31`	`36`	`}`
`32`	`37`	`}`
`33`	`38`