src/main.rs

@@ -1,13 +1,14 @@
 mod models;
 mod utils;
 
-use crate::{models::vanilla::{VanillaVersionDetail, VanillaVersionType, VanillaVersions}, utils::{with_progressbar, with_spinner}};
+use crate::{models::vanilla::{VanillaVersionDetail, VanillaVersionType, VanillaVersions}, utils::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;
@@ -73,31 +74,30 @@ async fn main() -> Result<(), Box<dyn Error>> {
                         .interact()?;
 
                     let version_detail: VanillaVersionDetail =
-                        with_spinner("", "", || async {
+                        reqwest::get(release_versions[version_index].url.clone())
-                            let version_detail: VanillaVersionDetail = 
+                            .await?
-                                reqwest::get(release_versions[version_index].url.clone())
+                            .json()
-                                    .await?
+                            .await?;
-                                    .json()
-                                    .await?;
-                            Ok(version_detail)
-                        }).await?;
 
-                    let start_msg = format!(
+                    println!(
                         "downloading server.jar for {} {}",
                         loaders[loader_index], release_version_names[version_index]
                     );
-                    with_progressbar(&start_msg, "download finished", version_detail.downloads.server.size, |pb| async move {
+                    let pb = ProgressBar::new(version_detail.downloads.server.size);
-                        let server_bytes = reqwest::get(version_detail.downloads.server.url).await?;
+                    pb.set_style(ProgressStyle::default_bar().template(
-                        let mut file = tokio::fs::File::create("server.jar").await?;
+                        "{bar:40.green/white} {bytes}/{total_bytes} ({bytes_per_sec})",
-                        let mut stream = server_bytes.bytes_stream();
+                    )?);
 
-                        while let Some(chunk) = stream.next().await {
+                    let server_bytes = reqwest::get(version_detail.downloads.server.url).await?;
-                            let chunk = chunk?;
+                    let mut file = tokio::fs::File::create("server.jar").await?;
-                            file.write_all(&chunk).await?;
+                    let mut stream = server_bytes.bytes_stream();
-                            pb.inc(chunk.len() as u64);
+
-                        }
+                    while let Some(chunk) = stream.next().await {
-                        Ok(())
+                        let chunk = chunk?;
-                    }).await?;
+                        file.write_all(&chunk).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, ProgressStyle};
+use indicatif::ProgressBar;
 
 pub async fn with_spinner<F, Fut, T>(
     start_msg: &str,
@@ -17,32 +17,7 @@ where
     let result = f().await;
 
     pb.finish_and_clear();
-    if !finish_msg.is_empty() {
+    println!("{} {}", dialoguer::console::style("✔").green(), finish_msg);
-        println!("{} {}", dialoguer::console::style("✔").green(), finish_msg);
-
-    }
-
-    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
 }