refactor: make a with_progressbar function

src/main.rs

@@ -1,14 +1,13 @@
 mod models;
 mod utils;
 
-use crate::{models::vanilla::{VanillaVersionDetail, VanillaVersionType, VanillaVersions}, utils::with_spinner};
+use crate::{models::vanilla::{VanillaVersionDetail, VanillaVersionType, VanillaVersions}, utils::{with_progressbar, with_spinner}};
 use clap::{
     Parser, Subcommand,
     builder::styling::{self},
 };
 use dialoguer::{FuzzySelect, Select, theme::ColorfulTheme};
 use futures_util::StreamExt;
-use indicatif::{ProgressBar, ProgressStyle};
 use sha1::{Digest, Sha1};
 use std::error::Error;
 use tokio::io::AsyncWriteExt;
@@ -79,25 +78,22 @@ async fn main() -> Result<(), Box<dyn Error>> {
                             .json()
                             .await?;
 
-                    println!(
+                    let start_msg = format!(
                         "downloading server.jar for {} {}",
                         loaders[loader_index], release_version_names[version_index]
                     );
-                    let pb = ProgressBar::new(version_detail.downloads.server.size);
+                    with_progressbar(&start_msg, "download finished", version_detail.downloads.server.size, |pb| async move {
-                    pb.set_style(ProgressStyle::default_bar().template(
+                        let server_bytes = reqwest::get(version_detail.downloads.server.url).await?;
-                        "{bar:40.green/white} {bytes}/{total_bytes} ({bytes_per_sec})",
+                        let mut file = tokio::fs::File::create("server.jar").await?;
-                    )?);
+                        let mut stream = server_bytes.bytes_stream();
 
-                    let server_bytes = reqwest::get(version_detail.downloads.server.url).await?;
+                        while let Some(chunk) = stream.next().await {
-                    let mut file = tokio::fs::File::create("server.jar").await?;
+                            let chunk = chunk?;
-                    let mut stream = server_bytes.bytes_stream();
+                            file.write_all(&chunk).await?;
-
+                            pb.inc(chunk.len() as u64);
-                    while let Some(chunk) = stream.next().await {
+                        }
-                        let chunk = chunk?;
+                        Ok(())
-                        file.write_all(&chunk).await?;
+                    }).await?;
-                        pb.inc(chunk.len() as u64);
-                    }
-                    pb.finish_with_message("download finished");
 
                     with_spinner("verifying sha1 hash", "sha1 hash verified", || async {
                         let data = tokio::fs::read("server.jar").await?;

src/utils.rs

@@ -1,5 +1,5 @@
 use std::{error::Error, future::Future};
-use indicatif::ProgressBar;
+use indicatif::{ProgressBar, ProgressStyle};
 
 pub async fn with_spinner<F, Fut, T>(
     start_msg: &str,
@@ -21,3 +21,25 @@ where
 
     result
 }
+
+pub async fn with_progressbar<F, Fut, T>(
+    start_msg: &str,
+    finish_msg: &str,
+    len: u64,
+    f: F,
+) -> Result<T, Box<dyn Error>>
+where 
+    F: FnOnce(ProgressBar) -> Fut,
+    Fut: Future<Output = Result<T, Box<dyn Error>>>
+{
+    let pb = ProgressBar::new(len);
+    pb.set_style(ProgressStyle::default_bar().template(
+        "{msg}\n{bar:40.green/white} {bytes}/{total_bytes} ({bytes_per_sec})",
+    )?);
+    pb.set_message(start_msg.to_string());
+
+    let result = f(pb.clone()).await;
+    pb.finish_with_message(finish_msg.to_string());
+
+    result
+}