Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,12 @@ This will produce an executable file at `target/release/impala` that you can cop

### Known Networks

`a`: Enable/Disable auto-connect.
`t`: Enable/Disable auto-connect.

`d`: Remove the network from the known networks list.

`a`: Show all the known networks.

### Access Point

`n`: Start a new access point.
Expand Down
4 changes: 4 additions & 0 deletions Release.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## TBA

- Show all the configured networks

## 0.5.0 - 2025-11-21

- Support for WPA2 Entreprise
Expand Down
4 changes: 3 additions & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,15 @@ pub struct KnownNetwork {
#[serde(default = "default_station_remove_known_network")]
pub remove: char,
pub toggle_autoconnect: char,
pub show_all: char,
}

impl Default for KnownNetwork {
fn default() -> Self {
Self {
remove: 'd',
toggle_autoconnect: 'a',
toggle_autoconnect: 't',
show_all: 'a',
}
}
}
Expand Down
55 changes: 44 additions & 11 deletions src/handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ pub async fn toggle_connect(app: &mut App, sender: UnboundedSender<Event>) -> Re
FocusedBlock::KnownNetworks => match &station.connected_network {
Some(connected_net) => {
if let Some(selected_net_index) = station.known_networks_state.selected() {
if selected_net_index > station.known_networks.len() - 1 {
// Can not connect to unavailble network
return Ok(());
}

let (selected_net, _signal) = &station.known_networks[selected_net_index];

if selected_net.name == connected_net.name {
Expand All @@ -55,6 +60,10 @@ pub async fn toggle_connect(app: &mut App, sender: UnboundedSender<Event>) -> Re
}
None => {
if let Some(selected_net_index) = station.known_networks_state.selected() {
if selected_net_index > station.known_networks.len() - 1 {
// Can not connect to unavailble network
return Ok(());
}
let (selected_net, _signal) = &station.known_networks[selected_net_index];
let net_index = station
.known_networks
Expand Down Expand Up @@ -378,11 +387,20 @@ pub async fn handle_key_events(
if let Some(net_index) =
station.known_networks_state.selected()
{
let (net, _signal) =
&station.known_networks[net_index];

if let Some(known_net) = &net.known_network {
known_net.forget(sender.clone()).await?;
if net_index > station.known_networks.len() - 1 {
let index = net_index.saturating_sub(
station.known_networks.len(),
);
let network =
&station.unavailable_known_networks[index];
network.forget(sender.clone()).await?;
} else {
let (net, _signal) =
&station.known_networks[net_index];

if let Some(known_net) = &net.known_network {
known_net.forget(sender.clone()).await?;
}
}
}
}
Expand All @@ -396,9 +414,9 @@ pub async fn handle_key_events(
{
if let Some(net_index) =
station.known_networks_state.selected()
&& net_index < station.known_networks.len()
{
let (net, _signal) =
&station.known_networks[net_index];
let (net, _) = &station.known_networks[net_index];

if let Some(known_net) = &net.known_network {
known_net
Expand All @@ -408,6 +426,14 @@ pub async fn handle_key_events(
}
}

// Show / Hide unavailable networks
KeyCode::Char(c)
if c == config.station.known_network.show_all =>
{
station.show_unavailable_known_networks =
!station.show_unavailable_known_networks;
}

// Connect/Disconnect
KeyCode::Enter => toggle_connect(app, sender).await?,
KeyCode::Char(c) if c == config.station.toggle_connect => {
Expand All @@ -420,12 +446,19 @@ pub async fn handle_key_events(
let i =
match station.known_networks_state.selected() {
Some(i) => {
if i < station.known_networks.len() - 1
let limit = if station
.show_unavailable_known_networks
{
i + 1
station.new_networks.len()
+ station
.unavailable_known_networks
.len()
- 1
} else {
i
}
station.new_networks.len() - 1
};

if i < limit { i + 1 } else { i }
}
None => 0,
};
Expand Down
72 changes: 70 additions & 2 deletions src/mode/station.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ use crate::{
config::Config,
device::Device,
event::Event,
mode::station::known_network::KnownNetwork,
notification::{Notification, NotificationLevel},
};

Expand All @@ -38,9 +39,11 @@ pub struct Station {
pub connected_network: Option<Network>,
pub new_networks: Vec<(Network, i16)>,
pub known_networks: Vec<(Network, i16)>,
pub unavailable_known_networks: Vec<KnownNetwork>,
pub known_networks_state: TableState,
pub new_networks_state: TableState,
pub diagnostic: Option<ActiveStationDiagnostics>,
pub show_unavailable_known_networks: bool,
}

impl Station {
Expand Down Expand Up @@ -94,6 +97,24 @@ impl Station {
.filter(|(net, _signal)| net.known_network.is_some())
.collect();

let available_networks_names: Vec<String> =
known_networks.iter().map(|(n, _)| n.name.clone()).collect();

let unavailable_known_networks =
if let Ok(iwd_known_networks) = session.known_networks().await {
let mut unavailable_known_networks = Vec::new();
for iwd_network in iwd_known_networks {
if let Ok(known_network) = KnownNetwork::new(iwd_network).await
&& !available_networks_names.contains(&known_network.name)
{
unavailable_known_networks.push(known_network);
}
}
unavailable_known_networks
} else {
Vec::new()
};

let mut new_networks_state = TableState::default();
if new_networks.is_empty() {
new_networks_state.select(None);
Expand Down Expand Up @@ -122,9 +143,11 @@ impl Station {
connected_network,
new_networks,
known_networks,
unavailable_known_networks,
known_networks_state,
new_networks_state,
diagnostic,
show_unavailable_known_networks: false,
})
}

Expand Down Expand Up @@ -217,6 +240,29 @@ impl Station {
self.known_networks = known_networks;
}

let available_networks_names: Vec<String> = self
.known_networks
.iter()
.map(|(n, _)| n.name.clone())
.collect();

let unavailable_known_networks =
if let Ok(iwd_known_networks) = self.session.known_networks().await {
let mut unavailable_known_networks = Vec::new();
for iwd_network in iwd_known_networks {
if let Ok(known_network) = KnownNetwork::new(iwd_network).await
&& !available_networks_names.contains(&known_network.name)
{
unavailable_known_networks.push(known_network);
}
}
unavailable_known_networks
} else {
Vec::new()
};

self.unavailable_known_networks = unavailable_known_networks;

self.connected_network = connected_network;

let iwd_station_diagnostic = self.session.stations_diagnostics().await.unwrap().pop();
Expand Down Expand Up @@ -403,7 +449,7 @@ impl Station {
//
// Known networks
//
let rows: Vec<Row> = self
let mut rows: Vec<Row> = self
.known_networks
.iter()
.map(|(net, signal)| {
Expand Down Expand Up @@ -455,6 +501,22 @@ impl Station {
})
.collect();

if self.show_unavailable_known_networks {
self.unavailable_known_networks.iter().for_each(|net| {
let row = Row::new(vec![
Line::from(""),
Line::from(net.name.clone()).centered(),
Line::from(net.network_type.to_string()).centered(),
Line::from(""),
Line::from(""),
Line::from(""),
])
.fg(Color::DarkGray);

rows.push(row);
});
}

let widths = [
Constraint::Length(2),
Constraint::Length(25),
Expand Down Expand Up @@ -644,7 +706,7 @@ impl Station {
Span::from(" Nav"),
])],
FocusedBlock::KnownNetworks => {
if frame.area().width <= 110 {
if frame.area().width <= 120 {
vec![
Line::from(vec![
Span::from(if config.station.toggle_connect == ' ' {
Expand All @@ -655,6 +717,9 @@ impl Station {
.bold(),
Span::from(" Dis/connect"),
Span::from(" | "),
Span::from(config.station.known_network.show_all.to_string()).bold(),
Span::from(" Show All"),
Span::from(" | "),
Span::from(config.station.known_network.remove.to_string()).bold(),
Span::from(" Remove"),
Span::from(" | "),
Expand Down Expand Up @@ -695,6 +760,9 @@ impl Station {
.bold(),
Span::from(" Dis/connect"),
Span::from(" | "),
Span::from(config.station.known_network.show_all.to_string()).bold(),
Span::from(" Show All"),
Span::from(" | "),
Span::from(config.station.known_network.remove.to_string()).bold(),
Span::from(" Remove"),
Span::from(" | "),
Expand Down
20 changes: 12 additions & 8 deletions src/mode/station/known_network.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,20 @@ impl KnownNetwork {
}

pub async fn forget(&self, sender: UnboundedSender<Event>) -> Result<()> {
if let Err(e) = self.n.forget().await {
Notification::send(e.to_string(), NotificationLevel::Error, &sender.clone())?;
return Ok(());
match self.n.forget().await {
Ok(()) => {
let _ = Notification::send(
format!("The Network {} is removed", self.name),
NotificationLevel::Info,
&sender,
);
}
Err(e) => {
let _ =
Notification::send(e.to_string(), NotificationLevel::Error, &sender.clone());
}
}

Notification::send(
"Network Removed".to_string(),
NotificationLevel::Info,
&sender,
)?;
Ok(())
}

Expand Down