Fix RegexParsingError when parsing device list (#37)

cocool97 · Oct 11, 2024 · 95fe89a · 95fe89a
1 parent e37b6d4
commit 95fe89a
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/adb_client/src/models/device_long.rs b/adb_client/src/models/device_long.rs
@@ -68,14 +68,13 @@ impl TryFrom<Vec<u8>> for DeviceLong {
                     .as_bytes()
                     .to_vec(),
             )?)?,
-            usb: String::from_utf8(
-                groups
-                    .name("usb1")
-                    .or_else(|| groups.name("usb2"))
-                    .ok_or(RustADBError::RegexParsingError)?
-                    .as_bytes()
-                    .to_vec(),
-            )?,
+            usb: match groups.name("usb1") {
+                None => match groups.name("usb2") {
+                    None => "Unk".to_string(),
+                    Some(usb) => String::from_utf8(usb.as_bytes().to_vec())?,
+                },
+                Some(usb) => String::from_utf8(usb.as_bytes().to_vec())?,
+            },
             product: match groups.name("product") {
                 None => "Unk".to_string(),
                 Some(product) => String::from_utf8(product.as_bytes().to_vec())?,