Improve UX

Provide better feed-back to users. This can be disabled (e.g. for
scripts) via the `--quiet` flag.

Author: qzed

src/cli.rs

@@ -80,4 +80,9 @@ pub fn app() -> App<'static, 'static> {
         .subcommand(perf)
         .subcommand(dgpu)
         .subcommand(latch)
+        .arg(Arg::with_name("quiet")
+            .help("Keep output quiet")
+            .short("q")
+            .long("quiet")
+            .global(true))
 }

src/main.rs

@@ -31,10 +31,9 @@ fn cmd_status(_: &clap::ArgMatches) -> Result<()> {
     let perf_mode  = sys::perf::Device::open()?.get_mode()?;
     let dgpu_power = sys::dgpu::Device::open()?.get_power()?;
 
-    println!("System Status:");
-    println!("  Device-Mode:      {}", opmode);
-    println!("  Performance-Mode: {}", perf_mode);
-    println!("  dGPU-Power:       {}", dgpu_power);
+    println!("       Device-Mode: {}", opmode);
+    println!("  Performance-Mode: {} ({})", perf_mode, perf_mode.short_str());
+    println!("        dGPU-Power: {}", dgpu_power);
 
     Ok(())
 }
@@ -52,11 +51,24 @@ fn cmd_dgpu_set(m: &clap::ArgMatches) -> Result<()> {
     use clap::value_t_or_exit;
     let state = value_t_or_exit!(m, "state", sys::dgpu::PowerState);
 
-    sys::dgpu::Device::open()?.set_power(state)
+    sys::dgpu::Device::open()?.set_power(state)?;
+
+    if !m.is_present("quiet") {
+        println!("dGPU power set to '{}'", state);
+    }
+
+    Ok(())
 }
 
-fn cmd_dgpu_get(_: &clap::ArgMatches) -> Result<()> {
-    println!("{}", sys::dgpu::Device::open()?.get_power()?);
+fn cmd_dgpu_get(m: &clap::ArgMatches) -> Result<()> {
+    let state = sys::dgpu::Device::open()?.get_power()?;
+
+    if !m.is_present("quiet") {
+        println!("dGPU power is '{}'", state);
+    } else {
+        println!("{}", state);
+    }
+
     Ok(())
 }
 
@@ -71,13 +83,26 @@ fn cmd_perf(m: &clap::ArgMatches) -> Result<()> {
 
 fn cmd_perf_set(m: &clap::ArgMatches) -> Result<()> {
     use clap::value_t_or_exit;
-    let state = value_t_or_exit!(m, "mode", sys::perf::Mode);
+    let mode = value_t_or_exit!(m, "mode", sys::perf::Mode);
+
+    sys::perf::Device::open()?.set_mode(mode)?;
 
-    sys::perf::Device::open()?.set_mode(state)
+    if !m.is_present("quiet") {
+        println!("Performance-mode set to '{}'", mode);
+    }
+
+    Ok(())
 }
 
-fn cmd_perf_get(_: &clap::ArgMatches) -> Result<()> {
-    println!("{}", sys::perf::Device::open()?.get_mode()?);
+fn cmd_perf_get(m: &clap::ArgMatches) -> Result<()> {
+    let mode = sys::perf::Device::open()?.get_mode()?;
+
+    if !m.is_present("quiet") {
+        println!("Performance-mode is '{}' ({})", mode, mode.short_str());
+    } else {
+        println!("{}", mode.short_str());
+    }
+
     Ok(())
 }
 
@@ -92,19 +117,44 @@ fn cmd_latch(m: &clap::ArgMatches) -> Result<()> {
     }
 }
 
-fn cmd_latch_lock(_: &clap::ArgMatches) -> Result<()> {
-    sys::latch::Device::open()?.latch_lock()
+fn cmd_latch_lock(m: &clap::ArgMatches) -> Result<()> {
+    sys::latch::Device::open()?.latch_lock()?;
+
+    if !m.is_present("quiet") {
+        println!("Clipboard latch locked");
+    }
+
+    Ok(())
 }
 
-fn cmd_latch_unlock(_: &clap::ArgMatches) -> Result<()> {
-    sys::latch::Device::open()?.latch_unlock()
+fn cmd_latch_unlock(m: &clap::ArgMatches) -> Result<()> {
+    sys::latch::Device::open()?.latch_unlock()?;
+
+    if !m.is_present("quiet") {
+        println!("Clipboard latch unlocked");
+    }
+
+    Ok(())
 }
 
-fn cmd_latch_request(_: &clap::ArgMatches) -> Result<()> {
-    sys::latch::Device::open()?.latch_request()
+fn cmd_latch_request(m: &clap::ArgMatches) -> Result<()> {
+    sys::latch::Device::open()?.latch_request()?;
+
+    if !m.is_present("quiet") {
+        println!("Clipboard latch request executed");
+    }
+
+    Ok(())
 }
 
-fn cmd_latch_get_opmode(_: &clap::ArgMatches) -> Result<()> {
-    println!("{}", sys::latch::Device::open()?.get_opmode()?);
+fn cmd_latch_get_opmode(m: &clap::ArgMatches) -> Result<()> {
+    let opmode = sys::latch::Device::open()?.get_opmode()?;
+
+    if !m.is_present("quiet") {
+        println!("Device is in '{}' mode", opmode);
+    } else {
+        println!("{}", opmode);
+    }
+
     Ok(())
 }

src/sys/latch.rs

@@ -22,9 +22,9 @@ pub enum OpMode {
 impl OpMode {
     pub fn as_str(&self) -> &'static str {
         match self {
-            OpMode::Tablet => "tablet",
-            OpMode::Laptop => "laptop",
-            OpMode::Studio => "studio",
+            OpMode::Tablet => "Tablet",
+            OpMode::Laptop => "Laptop",
+            OpMode::Studio => "Studio",
         }
     }
 }

src/sys/perf.rs

@@ -26,19 +26,28 @@ impl Mode {
         }
     }
 
-    pub fn as_str(&self) -> &'static str {
+    pub fn short_str(&self) -> &'static str {
         match self {
             Mode::Normal  => "1",
             Mode::Battery => "2",
             Mode::Perf1   => "3",
             Mode::Perf2   => "4",
         }
     }
+
+    pub fn long_str(&self) -> &'static str {
+        match self {
+            Mode::Normal  => "Normal",
+            Mode::Battery => "Battery-Saver",
+            Mode::Perf1   => "Better Perormance",
+            Mode::Perf2   => "Best Performance",
+        }
+    }
 }
 
 impl std::fmt::Display for Mode {
     fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
-        write!(fmt, "{}", self.as_str())
+        write!(fmt, "{}", self.long_str())
     }
 }
 
@@ -95,7 +104,7 @@ impl Device {
     }
 
     pub fn set_mode(&self, mode: Mode) -> Result<()> {
-        let mode = mode.as_str().as_bytes();
+        let mode = mode.short_str().as_bytes();
 
         let mut file = OpenOptions::new()
             .write(true)