git.delta.rocks / remowt / refs/commits / 2499daa8100a

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -351,9 +351,9 @@
 
 [[package]]
 name = "clap"
-version = "4.5.11"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
+checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -361,9 +361,9 @@
 
 [[package]]
 name = "clap_builder"
-version = "4.5.11"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
+checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
 dependencies = [
  "anstream",
  "anstyle",
@@ -373,9 +373,9 @@
 
 [[package]]
 name = "clap_derive"
-version = "4.5.11"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -863,24 +863,6 @@
 ]
 
 [[package]]
-name = "polkit-agent"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "pam-client",
- "polkit-shared",
- "rand",
- "serde",
- "tokio",
- "tracing",
- "tracing-subscriber",
- "ui-prompt",
- "uuid",
- "zbus",
- "zbus_polkit",
-]
-
-[[package]]
 name = "polkit-backend"
 version = "0.1.0"
 dependencies = [
@@ -1013,6 +995,29 @@
 checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
+name = "remowt-agent"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "pam-client",
+ "polkit-shared",
+ "rand",
+ "serde",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+ "ui-prompt",
+ "uuid",
+ "zbus",
+ "zbus_polkit",
+]
+
+[[package]]
+name = "remowt-ssh"
+version = "0.1.0"
+
+[[package]]
 name = "rpassword"
 version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,7 @@
 [workspace]
 members = ["cmds/*", "crates/*"]
 resolver = "2"
+
+[workspace.packages]
+bifrostlink = { path = "../bifrostlink/crates/bifrostlink" }
+bifrostlink-ports = { path = "../bifrostlink/crates/bifrostlink-ports" }

--- a/crates/ui-prompt/src/dbus.rs
+++ b/crates/ui-prompt/src/dbus.rs
@@ -40,12 +40,13 @@
 
 #[proxy(interface = "lach.PolkitInputHandler")]
 trait DbusPrompter {
-    async fn prompt_radio(
+    async fn prompt_enum(
         &self,
         prompt: &str,
         description: &str,
+        variants: &[&str],
         source: &[Source],
-    ) -> fdo::Result<bool>;
+    ) -> fdo::Result<u32>;
     async fn prompt_text(
         &self,
         echo: bool,
@@ -62,13 +63,16 @@
 }
 
 impl Prompter for DbusPrompterProxy<'_> {
-    async fn prompt_radio(
+    async fn prompt_enum(
         &self,
         prompt: &str,
         description: &str,
+        variants: &[&str],
         source: &[Source],
-    ) -> Result<bool> {
-        Ok(self.prompt_radio(prompt, description, source).await?)
+    ) -> Result<u32> {
+        Ok(self
+            .prompt_enum(prompt, description, variants, source)
+            .await?)
     }
 
     async fn prompt_text(
@@ -86,8 +90,14 @@
     }
 }
 impl BlockingPrompter for DbusPrompterProxyBlocking<'_> {
-    fn prompt_radio(&self, prompt: &str, description: &str, source: &[Source]) -> Result<bool> {
-        Ok(self.prompt_radio(prompt, description, source)?)
+    fn prompt_enum(
+        &self,
+        prompt: &str,
+        description: &str,
+        variants: &[&str],
+        source: &[Source],
+    ) -> Result<u32> {
+        Ok(self.prompt_enum(prompt, description, variants, source)?)
     }
 
     fn prompt_text(

--- a/crates/ui-prompt/src/lib.rs
+++ b/crates/ui-prompt/src/lib.rs
@@ -31,7 +31,17 @@
         prompt: &str,
         description: &str,
         source: &[Source],
-    ) -> impl Future<Output = Result<bool>> + Send;
+    ) -> impl Future<Output = Result<bool>> + Send {
+        let fut = self.prompt_enum(prompt, description, &["No", "Yes"], source);
+        async { fut.await.map(|v| v == 1) }
+    }
+    fn prompt_enum(
+        &self,
+        prompt: &str,
+        description: &str,
+        variants: &[&str],
+        source: &[Source],
+    ) -> impl Future<Output = Result<u32>> + Send;
     fn prompt_text(
         &self,
         echo: bool,
@@ -47,7 +57,17 @@
     ) -> impl Future<Output = Result<()>> + Send;
 }
 pub trait BlockingPrompter {
-    fn prompt_radio(&self, prompt: &str, description: &str, source: &[Source]) -> Result<bool>;
+    fn prompt_radio(&self, prompt: &str, description: &str, source: &[Source]) -> Result<bool> {
+        self.prompt_enum(prompt, description, &["No", "Yes"], source)
+            .map(|v| v == 1)
+    }
+    fn prompt_enum(
+        &self,
+        prompt: &str,
+        description: &str,
+        variants: &[&str],
+        source: &[Source],
+    ) -> Result<u32>;
     fn prompt_text(
         &self,
         echo: bool,
@@ -73,14 +93,15 @@
 where
     P: Prompter + Sync,
 {
-    async fn prompt_radio(
+    async fn prompt_enum(
         &self,
         prompt: &str,
         description: &str,
+        variants: &[&str],
         source: &[Source],
-    ) -> Result<bool> {
+    ) -> Result<u32> {
         self.prompter
-            .prompt_radio(prompt, description, &self.source(source))
+            .prompt_enum(prompt, description, variants, &self.source(source))
             .await
     }
 

--- a/crates/ui-prompt/src/rofi.rs
+++ b/crates/ui-prompt/src/rofi.rs
@@ -8,13 +8,19 @@
 
 pub struct RofiPrompter;
 
+fn fixup_prompt(prompt: &str) -> &str {
+    // Rofi always appends such suffix
+    prompt.strip_suffix(": ").unwrap_or(prompt)
+}
+
 impl Prompter for RofiPrompter {
-    async fn prompt_radio(
+    async fn prompt_enum(
         &self,
         prompt: &str,
         description: &str,
+        variants: &[&str],
         source: &[Source],
-    ) -> Result<bool> {
+    ) -> Result<u32> {
         trace!("rofi radio");
         let mut cmd = Command::new("rofi");
         let mesg = if source.is_empty() {
@@ -34,7 +40,9 @@
             "-sync",
             "-only-match",
             "-p",
-            prompt,
+            fixup_prompt(prompt),
+            "-format",
+            "i",
         ]);
         cmd.stdin(Stdio::piped());
         cmd.stdout(Stdio::piped());
@@ -43,13 +51,20 @@
             .spawn()
             .map_err(|e| Error::InputError(format!("failed to spawn rofi: {e}")))?;
 
-        child
-            .stdin
-            .take()
-            .expect("stdin is piped")
-            .write_all(b"Yes\nNo\n")
-            .await
-            .map_err(|e| Error::InputError(format!("failed to write rofi variants: {e}")))?;
+        let mut stdin = child.stdin.take().expect("stdin is piped");
+        for var in variants {
+            stdin
+                .write_all(var.replace('\n', " ").as_bytes())
+                .await
+                .map_err(|e| Error::InputError(format!("failed to write rofi variants: {e}")))?;
+            stdin
+                .write_all(b"\n")
+                .await
+                .map_err(|e| Error::InputError(format!("failed to write rofi variants: {e}")))?;
+        }
+        // write_all already flushes, just to be sure.
+        let _ = stdin.flush().await;
+        drop(stdin);
 
         let out = child
             .wait_with_output()
@@ -61,13 +76,15 @@
             .unwrap_or(&out.stdout)
             .to_owned();
 
-        if &stdout == b"Yes" {
-            Ok(true)
-        } else if &stdout == b"No" {
-            Ok(false)
-        } else {
-            Err(Error::InputError("bad rofi response".to_owned()))
+        let id: u32 = String::from_utf8(stdout)
+            .map_err(|e| Error::InputError(format!("rofi produced invalid output: {e}")))?
+            .parse()
+            .map_err(|e| Error::InputError(format!("rofi produced invalid output: {e}")))?;
+        if id as usize >= variants.len() {
+            return Err(Error::InputError("invalid rofi response".to_owned()));
         }
+
+        Ok(id)
     }
 
     async fn prompt_text(
@@ -89,7 +106,7 @@
             out.push_str("</b>");
             out
         };
-        cmd.args(["-dmenu", "-mesg", &mesg, "-p", prompt]);
+        cmd.args(["-dmenu", "-mesg", &mesg, "-p", fixup_prompt(prompt)]);
         if !echo {
             cmd.arg("-password");
         }