2 files changed, 32 insertions, 4 deletions
diff --git a/nitrocli/src/args.rs b/nitrocli/src/args.rs
index cb66bb2..869734c 100644
--- a/nitrocli/src/args.rs
+++ b/nitrocli/src/args.rs
@@ -31,7 +31,9 @@ type Result<T> = result::Result<T, Error>;
 /// A command execution context that captures additional data pertaining
 /// the command execution.
 #[derive(Debug)]
-pub struct ExecCtx {}
+pub struct ExecCtx {
+  pub verbosity: u64,
+}
 
 /// A top-level command for nitrocli.
 #[derive(Debug)]
@@ -950,9 +952,15 @@ fn pws_status(ctx: &ExecCtx, args: Vec<String>) -> Result<()> {
 /// Parse the command-line arguments and return the selected command and
 /// the remaining arguments for the command.
 fn parse_arguments(args: Vec<String>) -> Result<(Command, ExecCtx, Vec<String>)> {
+  let mut verbosity = 0;
   let mut command = Command::Status;
   let mut subargs = vec![];
   let mut parser = argparse::ArgumentParser::new();
+  let _ = parser.refer(&mut verbosity).add_option(
+    &["-v", "--verbose"],
+    argparse::IncrBy::<u64>(1),
+    "Increase the log level (can be supplied multiple times)",
+  );
   parser.set_description("Provides access to a Nitrokey device");
   let _ = parser.refer(&mut command).required().add_argument(
     "command",
@@ -970,7 +978,7 @@ fn parse_arguments(args: Vec<String>) -> Result<(Command, ExecCtx, Vec<String>)>
 
   subargs.insert(0, format!("nitrocli {}", command));
 
-  let ctx = ExecCtx { };
+  let ctx = ExecCtx { verbosity };
   Ok((command, ctx, subargs))
 }
 
diff --git a/nitrocli/src/commands.rs b/nitrocli/src/commands.rs
index aa99bd1..27faf05 100644
--- a/nitrocli/src/commands.rs
+++ b/nitrocli/src/commands.rs
@@ -38,13 +38,33 @@ fn get_error(msg: &str, err: nitrokey::CommandError) -> Error {
   Error::Error(format!("{}: {:?}", msg, err))
 }
 
+/// Set `libnitrokey`'s log level based on the execution context's verbosity.
+fn set_log_level(ctx: &args::ExecCtx) {
+  let log_lvl = match ctx.verbosity {
+    // The error log level is what libnitrokey uses by default. As such,
+    // there is no harm in us setting that as well when the user did not
+    // ask for higher verbosity.
+    0 => nitrokey::LogLevel::Error,
+    1 => nitrokey::LogLevel::Warning,
+    2 => nitrokey::LogLevel::Info,
+    3 => nitrokey::LogLevel::DebugL1,
+    4 => nitrokey::LogLevel::Debug,
+    _ => nitrokey::LogLevel::DebugL2,
+  };
+  nitrokey::set_log_level(log_lvl);
+}
+
 /// Connect to any Nitrokey device and return it.
-fn get_device(_ctx: &args::ExecCtx) -> Result<nitrokey::DeviceWrapper> {
+fn get_device(ctx: &args::ExecCtx) -> Result<nitrokey::DeviceWrapper> {
+  set_log_level(ctx);
+
   nitrokey::connect().map_err(|_| Error::Error("Nitrokey device not found".to_string()))
 }
 
 /// Connect to a Nitrokey Storage device and return it.
-fn get_storage_device(_ctx: &args::ExecCtx) -> Result<nitrokey::Storage> {
+fn get_storage_device(ctx: &args::ExecCtx) -> Result<nitrokey::Storage> {
+  set_log_level(ctx);
+
   nitrokey::Storage::connect().or_else(|_| {
     Err(Error::Error(
       "Nitrokey Storage device not found".to_string(),