diff --git a/oryx-tui/src/app.rs b/oryx-tui/src/app.rs index 982a8e7..d4a28a8 100644 --- a/oryx-tui/src/app.rs +++ b/oryx-tui/src/app.rs @@ -60,8 +60,6 @@ pub struct DataEventHandler { pub handler: thread::JoinHandle<()>, } -// let x = Protocol::NetworkProtocol(Tcp) - #[derive(Debug, Clone)] pub struct FilterChannel { pub sender: kanal::Sender<(Protocol, bool)>, @@ -75,6 +73,12 @@ impl FilterChannel { } } +impl Default for FilterChannel { + fn default() -> Self { + Self::new() + } +} + #[derive(Debug)] pub struct App { pub running: bool, diff --git a/oryx-tui/src/filters/link.rs b/oryx-tui/src/filters/link.rs index 212ee85..d3dd157 100644 --- a/oryx-tui/src/filters/link.rs +++ b/oryx-tui/src/filters/link.rs @@ -15,6 +15,12 @@ pub struct LinkFilter { pub applied_protocols: Vec, } +impl Default for LinkFilter { + fn default() -> Self { + Self::new() + } +} + impl LinkFilter { pub fn new() -> Self { Self { diff --git a/oryx-tui/src/filters/network.rs b/oryx-tui/src/filters/network.rs index cb5f729..2e28b2e 100644 --- a/oryx-tui/src/filters/network.rs +++ b/oryx-tui/src/filters/network.rs @@ -15,6 +15,12 @@ pub struct NetworkFilter { pub applied_protocols: Vec, } +impl Default for NetworkFilter { + fn default() -> Self { + Self::new() + } +} + impl NetworkFilter { pub fn new() -> Self { NetworkFilter { @@ -27,13 +33,12 @@ impl NetworkFilter { applied_protocols: Vec::new(), } } -} -impl NetworkFilter { pub fn apply(&mut self) { self.applied_protocols = self.selected_protocols.clone(); self.selected_protocols.clear(); } + pub fn render(&mut self, frame: &mut Frame, block: Rect, focused_block: &FocusedBlock) { let layout = Layout::default() .direction(Direction::Horizontal) diff --git a/oryx-tui/src/filters/transport.rs b/oryx-tui/src/filters/transport.rs index 4f10066..eb0ded4 100644 --- a/oryx-tui/src/filters/transport.rs +++ b/oryx-tui/src/filters/transport.rs @@ -15,7 +15,11 @@ pub struct TransportFilter { pub applied_protocols: Vec, } -impl TransportFilter {} +impl Default for TransportFilter { + fn default() -> Self { + Self::new() + } +} impl TransportFilter { pub fn new() -> Self { diff --git a/oryx-tui/src/handler.rs b/oryx-tui/src/handler.rs index 6628da6..962ba5c 100644 --- a/oryx-tui/src/handler.rs +++ b/oryx-tui/src/handler.rs @@ -611,7 +611,7 @@ pub fn handle_key_events( } for protocol in TransportProtocol::all().iter() { - if app.transport_filter.applied_protocols.contains(&protocol) { + if app.transport_filter.applied_protocols.contains(protocol) { app.ingress_filter_channel .sender .send((Protocol::Transport(*protocol), false))?; @@ -629,7 +629,7 @@ pub fn handle_key_events( } for protocol in NetworkProtocol::all().iter() { - if app.network_filter.applied_protocols.contains(&protocol) { + if app.network_filter.applied_protocols.contains(protocol) { app.ingress_filter_channel .sender .send((Protocol::Network(*protocol), false))?; @@ -647,7 +647,7 @@ pub fn handle_key_events( } for protocol in LinkProtocol::all().iter() { - if app.link_filter.applied_protocols.contains(&protocol) { + if app.link_filter.applied_protocols.contains(protocol) { app.ingress_filter_channel .sender .send((Protocol::Link(*protocol), false))?;