From d788a42660a61e68d79c749cceea90a652cba8ba Mon Sep 17 00:00:00 2001
From: John Whittington <git@jbrengineering.co.uk>
Date: Fri, 21 Jun 2024 11:06:01 +0200
Subject: [PATCH] udevrs fixes integrated; hwdb lookup working

---
 Cargo.lock  |  2 +-
 Cargo.toml  |  2 +-
 src/lib.rs  |  2 +-
 src/udev.rs | 15 ++++-----------
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 807112db..11771855 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -239,7 +239,7 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
 
 [[package]]
 name = "cyme"
-version = "1.6.0"
+version = "1.7.0"
 dependencies = [
  "assert-json-diff",
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index 62388d97..5ee33668 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ description = "List system USB buses and devices; a modern cross-platform `lsusb
 repository = "https://github.com/tuna-f1sh/cyme"
 readme = "README.md"
 license = "GPL-3.0-or-later"
-version = "1.6.1"
+version = "1.7.0"
 edition = "2021"
 keywords = ["usb", "lsusb", "system_profiler", "macos", "libusb"]
 categories = ["command-line-utilities"]
diff --git a/src/lib.rs b/src/lib.rs
index ce62aec2..e3704ea8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -45,12 +45,12 @@ pub mod icon;
 pub mod lsusb;
 pub mod system_profiler;
 pub mod types;
-pub mod usb;
 #[cfg(all(target_os = "linux", feature = "udev"))]
 pub mod udev;
 #[cfg(all(all(target_os = "linux", feature = "udevlib"), not(feature = "udev")))]
 #[path = "udev_ffi.rs"]
 pub mod udev;
+pub mod usb;
 
 /// Set cyme module and binary log level
 pub fn set_log_level(debug: u8) -> crate::error::Result<()> {
diff --git a/src/udev.rs b/src/udev.rs
index a1200131..cfd704cd 100644
--- a/src/udev.rs
+++ b/src/udev.rs
@@ -114,7 +114,9 @@ pub fn get_udev_attribute<T: AsRef<std::ffi::OsStr> + std::fmt::Display + Into<S
         )
     })?;
 
-    Ok(device.get_sysattr_value(&attribute.into()).map(|s| s.trim().to_string()))
+    Ok(device
+        .get_sysattr_value(&attribute.into())
+        .map(|s| s.trim().to_string()))
 }
 
 /// Utilities to get device information using udev hwdb - only supported on Linux. Requires 'udev' feature.
@@ -146,16 +148,7 @@ pub mod hwdb {
             )
         })?;
 
-        hwdb.get_properties_list_entry(&modalias.to_string(), 0)
-            .map(|mut entry| entry
-                .find(|entry| entry.name() == key)
-                .map(|entry| entry.value().to_owned())
-            ).map_err(|e| {
-                Error::new(
-                    ErrorKind::Udev,
-                    &format!("Failed to get hwdb modalias/key {}/{}: Error({})", modalias, key, e),
-                )
-            })
+        Ok(udevrs::udev_hwdb_query_one(&mut hwdb, modalias, key).map(|s| s.trim().to_string()))
     }
 }