lda/wakey
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 18 Wiki Activity

revert schizo

Browse Source
This commit is contained in:
lda
2026-04-15 11:29:46 +07:00 Unverified
parent c450e297c8
commit 150588d834
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/service/inventory.rs
+12 -14
View File
@@ -1,5 +1,3 @@
use std::collections::HashSet;
use anyhow::Result; use anyhow::Result;
use wakey_core::{ use wakey_core::{
Device, DeviceInventory, DhcpLease, DhcpLeaseWithState, InventoryQuery, NeighborEntry, Device, DeviceInventory, DhcpLease, DhcpLeaseWithState, InventoryQuery, NeighborEntry,
@@ -61,25 +59,25 @@ pub fn merge_devices(
.map(|(neighbors, leases)| Device::from_parts(neighbors, leases)) .map(|(neighbors, leases)| Device::from_parts(neighbors, leases))
.collect(); .collect();
let mut texts = HashSet::new(); let mut texts = Vec::new();
let mut devs = HashSet::new(); let mut devs = Vec::new();
let mut ips = HashSet::new(); let mut ips = Vec::new();
let mut macs = HashSet::new(); let mut macs = Vec::new();
let mut nuds = HashSet::new(); let mut nuds = Vec::new();
for term in query { for term in query {
match term { match term {
Query::Text(v) => texts.insert(v.as_str()), Query::Text(v) => texts.push(v.as_str()),
Query::Interface(v) => devs.insert(v.as_str()), Query::Interface(v) => devs.push(v.as_str()),
Query::Ip(v) => ips.insert(*v), Query::Ip(v) => ips.push(*v),
Query::Mac(v) => macs.insert(*v), Query::Mac(v) => macs.push(*v),
Query::NeighborState(v) => nuds.insert(*v), Query::NeighborState(v) => nuds.push(*v),
}; };
} }
devices.retain(|device| { devices.retain(|device| {
(texts.is_empty() || device.names.iter().any(|n| texts.contains(n.as_str()))) (texts.is_empty() || device.names.iter().any(|n| texts.contains(&n.as_str())))
&& (devs.is_empty() || device.interfaces.iter().any(|i| devs.contains(i.as_str()))) && (devs.is_empty() || device.interfaces.iter().any(|i| devs.contains(&i.as_str()))) // same pattern as iter().any
&& (ips.is_empty() || device.ips.iter().any(|ip| ips.contains(ip))) && (ips.is_empty() || device.ips.iter().any(|ip| ips.contains(ip)))
&& (macs.is_empty() || device.macs.iter().any(|mac| macs.contains(mac))) && (macs.is_empty() || device.macs.iter().any(|mac| macs.contains(mac)))
&& (nuds.is_empty() || device.neighbors.iter().any(|n| nuds.contains(&n.state))) && (nuds.is_empty() || device.neighbors.iter().any(|n| nuds.contains(&n.state)))