Update CLI for mullvad-daemon

2 files changed, 71 insertions, 105 deletions

diff --git a/mullvad-problem-report/src/lib.rs b/mullvad-problem-report/src/lib.rs
index 9a9b347677..088ceb27df 100644
--- a/mullvad-problem-report/src/lib.rs
+++ b/mullvad-problem-report/src/lib.rs
@@ -106,8 +106,8 @@ pub enum LogError {
     NoLocalAppDataDir,
 }
 
-pub fn collect_report(
-    extra_logs: &[&Path],
+pub fn collect_report<P: AsRef<Path>>(
+    extra_logs: &[P],
     output_path: &Path,
     redact_custom_strings: Vec<String>,
     #[cfg(target_os = "android")] android_log_dir: &Path,
diff --git a/mullvad-problem-report/src/main.rs b/mullvad-problem-report/src/main.rs
index af38f614d2..50a2e0ce18 100644
--- a/mullvad-problem-report/src/main.rs
+++ b/mullvad-problem-report/src/main.rs
@@ -1,8 +1,12 @@
 #![deny(rust_2018_idioms)]
 
-use clap::{crate_authors, crate_name};
+use clap::Parser;
 use mullvad_problem_report::{collect_report, Error};
-use std::{env, path::Path, process};
+use std::{
+    env,
+    path::{Path, PathBuf},
+    process,
+};
 use talpid_types::ErrorExt;
 
 fn main() {
@@ -15,110 +19,70 @@ fn main() {
     })
 }
 
+#[derive(Debug, Parser)]
+#[command(author, version = mullvad_version::VERSION, about, long_about = None)]
+#[command(
+    arg_required_else_help = true,
+    disable_help_subcommand = true,
+    disable_version_flag = true
+)]
+enum Cli {
+    /// Collect problem report to a single file
+    Collect {
+        /// The destination path for saving the collected report
+        #[arg(required = true, long, short = 'o')]
+        output: PathBuf,
+        /// Paths to additional log files to be included
+        extra_logs: Vec<PathBuf>,
+        /// List of strings to remove from the report
+        #[arg(long)]
+        redact: Vec<String>,
+    },
+
+    /// Send collected problem report
+    Send {
+        /// Path to a previously collected report file
+        #[arg(required = true, long, short = 'r')]
+        report: PathBuf,
+        /// Email to attach to the problem report
+        #[arg(long, short = 'e')]
+        email: Option<String>,
+        /// Message to include in the problem report
+        #[arg(long, short = 'm')]
+        message: Option<String>,
+    },
+}
+
 fn run() -> Result<(), Error> {
     env_logger::init();
-    let app = clap::App::new(crate_name!())
-        .version(mullvad_version::VERSION)
-        .author(crate_authors!())
-        .about("Mullvad VPN problem report tool. Collects logs and sends them to Mullvad support.")
-        .setting(clap::AppSettings::SubcommandRequiredElseHelp)
-        .global_setting(clap::AppSettings::DisableHelpSubcommand)
-        .global_setting(clap::AppSettings::DisableVersionFlag)
-        .subcommand(
-            clap::App::new("collect")
-                .about("Collect problem report")
-                .arg(
-                    clap::Arg::new("output")
-                        .help("The destination path for saving the collected report.")
-                        .long("output")
-                        .short('o')
-                        .value_name("PATH")
-                        .allow_invalid_utf8(true)
-                        .takes_value(true)
-                        .required(true),
-                )
-                .arg(
-                    clap::Arg::new("extra_logs")
-                        .help("Paths to additional log files to be included.")
-                        .multiple_occurrences(true)
-                        .multiple_values(true)
-                        .value_name("EXTRA LOGS")
-                        .allow_invalid_utf8(true)
-                        .takes_value(true)
-                        .required(false),
-                )
-                .arg(
-                    clap::Arg::new("redact")
-                        .help("List of words and expressions to remove from the report")
-                        .long("redact")
-                        .value_name("PHRASE")
-                        .multiple_occurrences(true)
-                        .multiple_values(true)
-                        .takes_value(true),
-                ),
-        )
-        .subcommand(
-            clap::App::new("send")
-                .about("Send collected problem report")
-                .arg(
-                    clap::Arg::new("report")
-                        .long("report")
-                        .short('r')
-                        .help("The path to previously collected report file.")
-                        .allow_invalid_utf8(true)
-                        .takes_value(true)
-                        .required(true),
-                )
-                .arg(
-                    clap::Arg::new("email")
-                        .long("email")
-                        .short('e')
-                        .help("Reporter's email")
-                        .takes_value(true)
-                        .required(false),
-                )
-                .arg(
-                    clap::Arg::new("message")
-                        .long("message")
-                        .short('m')
-                        .help("Reporter's message")
-                        .takes_value(true)
-                        .required(false),
-                ),
-        );
-
-    let matches = app.get_matches();
 
-    if let Some(collect_matches) = matches.subcommand_matches("collect") {
-        let redact_custom_strings = collect_matches
-            .values_of_t("redact")
-            .unwrap_or_else(|_| vec![]);
-        let extra_logs = collect_matches
-            .values_of_os("extra_logs")
-            .map(|os_values| os_values.map(Path::new).collect())
-            .unwrap_or_else(Vec::new);
-        let output_path = Path::new(collect_matches.value_of_os("output").unwrap());
-        collect_report(&extra_logs, output_path, redact_custom_strings)?;
+    match Cli::parse() {
+        Cli::Collect {
+            output,
+            extra_logs,
+            redact,
+        } => {
+            collect_report(&extra_logs, &output, redact)?;
 
-        let expanded_output_path = output_path
-            .canonicalize()
-            .unwrap_or_else(|_| output_path.to_owned());
-        println!(
-            "Problem report written to {}",
-            expanded_output_path.display()
-        );
-        println!();
-        println!("Send the problem report to support via the send subcommand. See:");
-        println!(" $ {} send --help", env::args().next().unwrap());
-        Ok(())
-    } else if let Some(send_matches) = matches.subcommand_matches("send") {
-        let report_path = Path::new(send_matches.value_of_os("report").unwrap());
-        let user_email = send_matches.value_of("email").unwrap_or("");
-        let user_message = send_matches.value_of("message").unwrap_or("");
-        send_problem_report(user_email, user_message, report_path)
-    } else {
-        unreachable!("No sub command given");
+            println!("Problem report written to {}", output.display());
+            println!();
+            println!("Send the problem report to support via the send subcommand. See:");
+            println!(" $ {} send --help", env::args().next().unwrap());
+        }
+        Cli::Send {
+            report,
+            email,
+            message,
+        } => {
+            send_problem_report(
+                &email.unwrap_or_default(),
+                &message.unwrap_or_default(),
+                &report,
+            )?;
+        }
     }
+
+    Ok(())
 }
 
 fn send_problem_report(
@@ -128,9 +92,11 @@ fn send_problem_report(
 ) -> Result<(), Error> {
     let cache_dir = mullvad_paths::get_cache_dir().map_err(Error::ObtainCacheDirectory)?;
     mullvad_problem_report::send_problem_report(user_email, user_message, report_path, &cache_dir)
-        .map(|()| println!("Problem report sent"))
         .map_err(|error| {
             eprintln!("{}", error.display_chain());
             error
-        })
+        })?;
+
+    println!("Problem report sent");
+    Ok(())
 }