Refactor get_device to use nitrokey::connect_model

nitrokey 0.3.1 introduced the connect_model function that connects to a
specific model given by an enum variant and returns a DeviceWrapper.
This new function allows us to remove the manual selection of a
connection method from the get_device function.  We only have to
implement From<DeviceModel> for nitrokey::Model to be able to convert
our model enum to nitrokey's model enum.

1 files changed, 1 insertions, 6 deletions

diff --git a/nitrocli/src/commands.rs b/nitrocli/src/commands.rs
index ed3c2c4..b37f9c5 100644
--- a/nitrocli/src/commands.rs
+++ b/nitrocli/src/commands.rs
@@ -59,12 +59,7 @@ fn get_device(ctx: &mut args::ExecCtx<'_>) -> Result<nitrokey::DeviceWrapper> {
   set_log_level(ctx);
 
   match ctx.model {
-    Some(model) => match model {
-      args::DeviceModel::Pro => nitrokey::Pro::connect().map(nitrokey::DeviceWrapper::Pro),
-      args::DeviceModel::Storage => {
-        nitrokey::Storage::connect().map(nitrokey::DeviceWrapper::Storage)
-      }
-    },
+    Some(model) => nitrokey::connect_model(model.into()),
     None => nitrokey::connect(),
   }
   .map_err(|_| Error::Error("Nitrokey device not found".to_string()))