b475d28 cli: format ipv6 addresses in square brackets — heartwood

Radicle Heartwood Protocol & Stack

cli: format ipv6 addresses in square brackets

✗ CI failure Defelo committed 2 months ago

commit b475d287779c12fa34454a71706c65d19c6da236
parent 7a334edd0f0193298c0f4f6acc6bc4ec948c5840

1 failed (1 total) View logs

2 files changed +17 -5

modified crates/radicle-cli/src/commands/node/control.rs

@@ -198,8 +198,9 @@ pub fn connect(

     timeout: time::Duration,
 ) -> anyhow::Result<()> {
     let spinner = term::spinner(format!(
         "Connecting to {}@{addr}...",
         term::format::node_id_human_compact(&nid)
         "Connecting to {}@{}...",
         term::format::node_id_human_compact(&nid),
         term::format::addr(&addr),
     ));
     match node.connect(
         nid,

@@ -226,8 +227,9 @@ pub fn connect_many(

     let mut errors = HashMap::new();
     for addr in addrs {
         spinner.message(format!(
             "Connecting to {}@{addr}...",
             term::format::node_id_human_compact(&nid)
             "Connecting to {}@{}...",
             term::format::node_id_human_compact(&nid),
             term::format::addr(&addr),
         ));
         match node.connect(
             nid,

modified crates/radicle-cli/src/terminal/format.rs

@@ -1,4 +1,5 @@

 use std::fmt;
 use std::net::IpAddr;
 use localtime::LocalTime;

@@ -33,9 +34,18 @@ pub fn node_id_human(node: &NodeId) -> Paint<String> {

 }
 #[must_use]
 pub fn addr(address: &Address) -> Paint<String> {
     Paint::new(match address.host() {
         HostName::Ip(IpAddr::V6(ip)) => format!("[{ip}]:{}", address.port()),
         _ => address.to_string(),
     })
 }
 #[must_use]
 pub fn addr_compact(address: &Address) -> Paint<String> {
     let host = match address.host() {
         HostName::Ip(ip) => ip.to_string(),
         HostName::Ip(IpAddr::V4(ip)) => ip.to_string(),
         HostName::Ip(IpAddr::V6(ip)) => format!("[{ip}]"),
         HostName::Dns(dns) => dns.clone(),
         HostName::Tor(onion) => {
             let onion = onion.to_string();