diff options
| author | Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com> | 2021-08-30 03:58:36 +0000 |
|---|---|---|
| committer | Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com> | 2021-08-30 04:18:00 +0000 |
| commit | 55a07105a5c6b5f9ba0224c3f54c1076b63888ab (patch) | |
| tree | 6302c540464bd3b8d26f290365d38daaf7b9fea5 | |
| parent | Update Cargo.lock (diff) | |
| download | miniserve-55a07105a5c6b5f9ba0224c3f54c1076b63888ab.tar.gz miniserve-55a07105a5c6b5f9ba0224c3f54c1076b63888ab.zip | |
address review comment
| -rw-r--r-- | src/main.rs | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/main.rs b/src/main.rs index a537bf9..882fd08 100644 --- a/src/main.rs +++ b/src/main.rs @@ -149,7 +149,7 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> { } } - let addresses = { + let display_urls = { let (mut ifaces, wildcard): (Vec<_>, Vec<_>) = miniserve_config .interfaces .clone() @@ -172,7 +172,7 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> { ifaces.sort(); } - let urls = ifaces + ifaces .into_iter() .map(|addr| match addr { IpAddr::V4(_) => format!("{}:{}", addr, miniserve_config.port), @@ -187,9 +187,7 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> { None => url, }) .map(|url| Color::Green.paint(url).bold().to_string()) - .collect::<Vec<_>>(); - - urls.join("\n\t") + .collect::<Vec<_>>() }; let socket_addresses = miniserve_config @@ -198,6 +196,11 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> { .map(|&interface| SocketAddr::new(interface, miniserve_config.port)) .collect::<Vec<_>>(); + let display_sockets = socket_addresses + .iter() + .map(|sock| Color::Green.paint(sock.to_string()).bold().to_string()) + .collect::<Vec<_>>(); + let srv = actix_web::HttpServer::new(move || { App::new() .wrap(configure_header(&inside_config.clone())) @@ -236,10 +239,13 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> { let srv = srv.shutdown_timeout(0).run(); + println!("Bound to {}", display_sockets.join(", ")); + + println!("Serving path {}", Color::Yellow.paint(path_string).bold()); + println!( - "Serving path {path} at:\n\t{addresses}\n", - path = Color::Yellow.paint(path_string).bold(), - addresses = addresses, + "Availabe at (non-exhaustive list):\n {}\n", + display_urls.join("\n "), ); if atty::is(atty::Stream::Stdout) { |