From dc318b332a0f75349744684f8b05ff188611cbc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Sun, 11 Apr 2021 00:29:09 +0200
Subject: align server status output

---
 mumctl/src/main.rs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'mumctl/src')

diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs
index 4ce7fc1..dbd62c6 100644
--- a/mumctl/src/main.rs
+++ b/mumctl/src/main.rs
@@ -500,6 +500,15 @@ fn match_server_command(server_command: Server, config: &mut Config) -> Result<(
             if config.servers.is_empty() {
                 return Err(CliError::NoServers)?;
             }
+
+            let longest = config
+                .servers
+                .iter()
+                .map(|s| s.name.len())
+                .max()
+                .unwrap()  // ok since !config.servers.is_empty() above
+                + 1;
+
             let queries: Vec<_> = config
                 .servers
                 .iter()
@@ -513,6 +522,7 @@ fn match_server_command(server_command: Server, config: &mut Config) -> Result<(
                     })
                 })
                 .collect();
+
             for (server, response) in config.servers.iter().zip(queries) {
                 match response.join().unwrap() {
                     Ok(Ok(Some(response))) => {
@@ -522,13 +532,13 @@ fn match_server_command(server_command: Server, config: &mut Config) -> Result<(
                             ..
                         } = response
                         {
-                            println!("{} [{}/{}]", server.name, users, max_users);
+                            println!("{0:<1$} [{2:}/{3:}]", server.name, longest, users, max_users);
                         } else {
                             unreachable!();
                         }
                     }
                     Ok(Ok(None)) => {
-                        println!("{} offline", server.name);
+                        println!("{0:<1$} offline", server.name, longest);
                     }
                     Ok(Err(e)) => {
                         error!("{}", e);
-- 
cgit v1.2.1