Merge pull request #220 from jamesmcm/pactlfix

Fix pactl parsing when in non-English language
jamesmcm · Apr 19, 2023 · 8026b9d · 8026b9d
2 parents a566ec5 + e18c385
commit 8026b9d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/exec.rs b/src/exec.rs
@@ -287,7 +287,7 @@ pub fn exec(command: ExecCommand, uiclient: &dyn UiClient) -> anyhow::Result<()>
         let short_name = if server_name.len() > 7 {
             bs58::encode(&server_name).into_string()[0..7].to_string()
         } else {
-            server_name.clone()
+            server_name.replace('-', "")
         };
         format!("vo_{alias}_{short_name}")
     };

diff --git a/vopono_core/src/util/pulseaudio.rs b/vopono_core/src/util/pulseaudio.rs
@@ -4,8 +4,11 @@ use regex::Regex;
 use std::process::Command;
 
 pub fn get_pulseaudio_server() -> anyhow::Result<String> {
-    let output = Command::new("pactl").args(["info"]).output()?.stdout;
-    let re = Regex::new(r"Server String: ([^\n]+)").unwrap();
+    let output = Command::new("pactl")
+        .args(["-f", "json", "info"])
+        .output()?
+        .stdout;
+    let re = Regex::new("\"server_string\":\"([^\"]+)\"").unwrap();
     let output = std::str::from_utf8(&output)?;
 
     let caps = re.captures(output);