mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-08-03 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: use filter_map when filtering for devices that have already been found

Browse source
This commit is contained in:
Gabriele Musco 2024-08-06 14:12:17 +02:00
commit cf2fa339ad
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/xr_devices.rs
View file

@ -298,11 +298,11 @@ impl XRDevice {
}) })
.collect::<Vec<Self>>(); .collect::<Vec<Self>>();
if let Ok(all_devs) = monado.devices() { if let Ok(all_devs) = monado.devices() {
res.extend( res.extend(all_devs.into_iter().filter_map(|dev| {
all_devs if devs_with_role.contains(&dev.id) {
.into_iter() None
.filter(|dev| !devs_with_role.contains(&dev.id)) } else {
.map(|dev| Self { Some(Self {
index: dev.id.to_string(), index: dev.id.to_string(),
serial: dev.serial().ok(), serial: dev.serial().ok(),
battery: dev.battery_status().ok().and_then(|bs| { battery: dev.battery_status().ok().and_then(|bs| {
@ -314,8 +314,9 @@ impl XRDevice {
}), }),
name: dev.name, name: dev.name,
dev_type: XRDeviceRole::GenericTracker, dev_type: XRDeviceRole::GenericTracker,
}), })
) }
}))
} }
res res
} }