Add pepsi wireless scan (#1413)

* Add pepsi wireless scan * Do not perform wireless scan when using --prepare --------- Co-authored-by: Julian Schuler <[email protected]>
HULKs · Jul 21, 2024 · 5a5a818 · 5a5a818
1 parent 076bfa6
commit 5a5a818
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/nao/src/lib.rs b/crates/nao/src/lib.rs
@@ -317,6 +317,24 @@ impl Nao {
         String::from_utf8(output.stdout).wrap_err("failed to decode UTF-8")
     }
 
+    pub async fn scan_networks(&self) -> Result<()> {
+        let output = self
+            .ssh_to_nao()
+            .arg("iwctl")
+            .arg("station")
+            .arg("wlan0")
+            .arg("scan")
+            .output()
+            .await
+            .wrap_err("failed to execute iwctl ssh command")?;
+
+        if !output.status.success() {
+            bail!("iwctl ssh command exited with {}", output.status);
+        }
+
+        Ok(())
+    }
+
     pub async fn set_network(&self, network: Network) -> Result<()> {
         let command_string = [
             Network::SplA,

diff --git a/tools/pepsi/Cargo.toml b/tools/pepsi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pepsi"
-version = "3.15.0"
+version = "3.16.0"
 edition.workspace = true
 license.workspace = true
 homepage.workspace = true

diff --git a/tools/pepsi/src/pre_game.rs b/tools/pepsi/src/pre_game.rs
@@ -97,6 +97,10 @@ pub async fn pre_game(arguments: Arguments, repository: &Repository) -> Result<(
     .wrap_err("failed to set player numbers")?;
 
     if !arguments.prepare {
+        wireless(WirelessArguments::Scan { naos: naos.clone() })
+            .await
+            .wrap_err("failed to scan for networks")?;
+
         wireless(WirelessArguments::Set {
             network: arguments.network,
             naos: naos.clone(),

diff --git a/tools/pepsi/src/wireless.rs b/tools/pepsi/src/wireless.rs
@@ -17,6 +17,12 @@ pub enum Arguments {
         #[arg(required = true)]
         naos: Vec<NaoAddress>,
     },
+    /// Scan for networks
+    Scan {
+        /// The NAOs to execute that command on e.g. 20w or 10.1.24.22
+        #[arg(required = true)]
+        naos: Vec<NaoAddress>,
+    },
     /// Set active network
     Set {
         /// The network to connect the wireless device to (None disconnects from anything)
@@ -40,6 +46,7 @@ pub enum Arguments {
 pub async fn wireless(arguments: Arguments) -> Result<()> {
     match arguments {
         Arguments::Status { naos } => status(naos).await,
+        Arguments::Scan { naos } => scan(naos).await,
         Arguments::List { naos } => available_networks(naos).await,
         Arguments::Set { network, naos } => set(naos, network).await,
     };
@@ -61,6 +68,20 @@ async fn status(naos: Vec<NaoAddress>) {
     .await;
 }
 
+async fn scan(naos: Vec<NaoAddress>) {
+    ProgressIndicator::map_tasks(
+        naos,
+        "Starting network scan...",
+        |nao_address, _progress_bar| async move {
+            let nao = Nao::try_new_with_ping(nao_address.ip).await?;
+            nao.scan_networks()
+                .await
+                .wrap_err_with(|| format!("failed to scan for networks on {nao_address}"))
+        },
+    )
+    .await;
+}
+
 async fn available_networks(naos: Vec<NaoAddress>) {
     ProgressIndicator::map_tasks(
         naos,