Clean up key::filter_connected
This commit is contained in:
+9
-14
@@ -39,21 +39,16 @@ pub(crate) fn is_connected(reader: Reader) -> bool {
|
|||||||
|
|
||||||
pub(crate) fn filter_connected(reader: &Reader) -> bool {
|
pub(crate) fn filter_connected(reader: &Reader) -> bool {
|
||||||
match reader.open() {
|
match reader.open() {
|
||||||
Ok(_) => true,
|
Err(yubikey::Error::PcscError {
|
||||||
Err(e) => {
|
inner: Some(pcsc::Error::RemovedCard),
|
||||||
use std::error::Error;
|
}) => {
|
||||||
if let Some(pcsc::Error::RemovedCard) =
|
warn!(
|
||||||
e.source().and_then(|inner| inner.downcast_ref())
|
"{}",
|
||||||
{
|
fl!("warn-yk-not-connected", yubikey_name = reader.name())
|
||||||
warn!(
|
);
|
||||||
"{}",
|
false
|
||||||
fl!("warn-yk-not-connected", yubikey_name = reader.name())
|
|
||||||
);
|
|
||||||
false
|
|
||||||
} else {
|
|
||||||
true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
_ => true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user