install: Add a spinner for container deployment

This can take substantial time.

Signed-off-by: Colin Walters <[email protected]>

Author: cgwalters

lib/src/install.rs

@@ -650,10 +650,11 @@ async fn initialize_ostree_root_from_self(
     options.kargs = Some(kargs.as_slice());
     options.target_imgref = Some(&state.target_imgref);
     options.proxy_cfg = proxy_cfg;
-    println!("Deploying container image");
-    let imgstate =
-        ostree_container::deploy::deploy(&sysroot, stateroot, &src_imageref, Some(options)).await?;
-    println!("Deployment complete");
+    let imgstate = crate::utils::async_task_with_spinner(
+        "Deploying container image",
+        ostree_container::deploy::deploy(&sysroot, stateroot, &src_imageref, Some(options)),
+    )
+    .await?;
 
     sysroot.load(cancellable)?;
     let deployment = sysroot

lib/src/utils.rs

@@ -1,4 +1,7 @@
+use std::future::Future;
+use std::io::Write;
 use std::process::Command;
+use std::time::Duration;
 
 use anyhow::{Context, Result};
 use ostree::glib;
@@ -87,6 +90,35 @@ pub(crate) fn medium_visibility_warning(s: &str) {
     std::thread::sleep(std::time::Duration::from_secs(1));
 }
 
+/// Call an async task function, and write a message to stdout
+/// with an automatic spinner to show that we're not blocked.
+/// Note that generally the called function should not output
+/// anything to stdout as this will interfere with the spinner.
+pub(crate) async fn async_task_with_spinner<F, T>(msg: &'static str, f: F) -> T
+where
+    F: Future<Output = T>,
+{
+    let pb = indicatif::ProgressBar::new_spinner();
+    let style = indicatif::ProgressStyle::default_bar();
+    pb.set_style(style.template("{spinner} {msg}").unwrap());
+    pb.set_message(msg);
+    pb.enable_steady_tick(Duration::from_millis(150));
+    // We need to handle the case where we aren't connected to
+    // a tty, so indicatif would show nothing by default.
+    if pb.is_hidden() {
+        print!("{}...", msg);
+        std::io::stdout().flush().unwrap();
+    } else {
+    }
+    let r = f.await;
+    if pb.is_hidden() {
+        println!("done");
+    } else {
+        pb.finish_with_message(format!("{msg}: done"));
+    }
+    r
+}
+
 /// Given a possibly tagged image like quay.io/foo/bar:latest and a digest 0ab32..., return
 /// the digested form quay.io/foo/bar:latest@sha256:0ab32...
 /// If the image already has a digest, it will be replaced.