From b5e774cf2bdebeece0fe17fd07433cae59cc945c Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 17 Dec 2019 16:24:23 -0600
Subject: [PATCH] pcsc::Error::NoReadersAvailable -> Error::NotFound in
 YubiKey::open*

This provides a consistent user experience between no readers being
connected, and readers being connected but not the one we are trying to
open.
---
 src/yubikey.rs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/yubikey.rs b/src/yubikey.rs
index 4c7ee76..df740ec 100644
--- a/src/yubikey.rs
+++ b/src/yubikey.rs
@@ -157,7 +157,12 @@ impl YubiKey {
     /// attached to the same system, use [`YubiKey::open_by_serial`] or
     ///[`yubikey_piv::Readers`] to select from the available PC/SC readers.
     pub fn open() -> Result<Self, Error> {
-        let mut readers = Readers::open()?;
+        let mut readers = Readers::open().map_err(|e| match e {
+            Error::PcscError {
+                inner: Some(pcsc::Error::NoReadersAvailable),
+            } => Error::NotFound,
+            other => other,
+        })?;
         let mut reader_iter = readers.iter()?;
 
         if let Some(reader) = reader_iter.next() {
@@ -175,7 +180,12 @@ impl YubiKey {
 
     /// Open a YubiKey with a specific serial number.
     pub fn open_by_serial(serial: Serial) -> Result<Self, Error> {
-        let mut readers = Readers::open()?;
+        let mut readers = Readers::open().map_err(|e| match e {
+            Error::PcscError {
+                inner: Some(pcsc::Error::NoReadersAvailable),
+            } => Error::NotFound,
+            other => other,
+        })?;
 
         for reader in readers.iter()? {
             let yubikey = match reader.open() {