Added loading bar when upgrading

Author: theRookieCoder

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog for Ferium
 
+## `v3.28.5`
+### 11.05.2022
+
+- Added a progress bar that looks very cool when upgrading
+  - Not that you can see it for that long anyways :P
+
 ## `v3.28.4`
 ### 11.05.2022
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ferium"
-version = "3.28.4"
+version = "3.28.5"
 edition = "2021"
 authors = ["Ilesh Thiada (theRookieCoder) <[email protected]>", "薛詠謙 (KyleUltimate)", "Daniel Hauck (SolidTux)"]
 description = "Ferium is a CLI program for managing Minecraft mods from Modrinth, CurseForge, and Github Releases"
@@ -28,8 +28,9 @@ octocrab = { version = "0.16", default-features = false, features = ["rustls"] }
 clap = { version = "3.1", features = ["derive"] }
 lazy_static = "1.4"
 dialoguer = "0.10"
-serde_json = "1.0"
+indicatif = "0.16"
 itertools = "0.10"
+serde_json = "1.0"
 fs_extra = "1.2"
 colored = "2.0"
 ferinth = "2.2"

Cargo.toml

@@ -8,6 +8,7 @@ use cli::{Ferium, ProfileSubCommands, SubCommands};
 use colored::{ColoredString, Colorize};
 use ferinth::Ferinth;
 use furse::Furse;
+use indicatif::ProgressStyle;
 use lazy_static::lazy_static;
 use libium::config;
 use octocrab::OctocrabBuilder;
@@ -21,6 +22,9 @@ lazy_static! {
     pub static ref YELLOW_TICK: ColoredString = "✓".yellow();
     pub static ref THEME: dialoguer::theme::ColorfulTheme =
         dialoguer::theme::ColorfulTheme::default();
+    pub static ref STYLE: ProgressStyle = ProgressStyle::default_bar()
+        .template("{spinner:.green} [{elapsed_precise}] [{wide_bar:.cyan/blue}] {pos}/{len}")
+        .progress_chars("#>-");
 }
 
 fn main() {

src/main.rs

@@ -1,9 +1,10 @@
-use crate::{mutex_ext::MutexExt, CROSS, TICK, YELLOW_TICK};
+use crate::{mutex_ext::MutexExt, CROSS, STYLE, TICK, YELLOW_TICK};
 use anyhow::{bail, Error, Result};
 use colored::Colorize;
 use ferinth::Ferinth;
 use fs_extra::file::{move_file, CopyOptions};
 use furse::Furse;
+use indicatif::ProgressBar;
 use itertools::Itertools;
 use libium::{check, config, upgrade};
 use octocrab::Octocrab;
@@ -28,14 +29,21 @@ pub async fn upgrade(
 ) -> Result<()> {
     let profile = Arc::new(profile.clone());
     let to_download = Arc::new(Mutex::new(Vec::new()));
+    let progress_bar = Arc::new(Mutex::new(
+        ProgressBar::new(profile.mods.len() as u64).with_style(STYLE.clone()),
+    ));
     let backwards_compat_msg = Arc::new(AtomicBool::new(false));
     let error = Arc::new(AtomicBool::new(false));
     let mut tasks = Vec::new();
 
     println!("{}\n", "Determining the Latest Compatible Versions".bold());
+    {
+        progress_bar.force_lock().enable_steady_tick(100);
+    }
     for mod_ in &profile.mods {
         let backwards_compat_msg = backwards_compat_msg.clone();
         let to_download = to_download.clone();
+        let progress_bar = progress_bar.clone();
         let curseforge = curseforge.clone();
         let modrinth = modrinth.clone();
         let profile = profile.clone();
@@ -52,9 +60,10 @@ pub async fn upgrade(
                 &profile.mod_loader,
             )
             .await;
+            let progress_bar = progress_bar.force_lock();
             match result {
                 Ok((downloadable, backwards_compat)) => {
-                    println!(
+                    progress_bar.println(format!(
                         "{} {:45} {}",
                         if backwards_compat {
                             backwards_compat_msg.store(true, Ordering::Relaxed);
@@ -64,7 +73,7 @@ pub async fn upgrade(
                         },
                         mod_.name,
                         format!("({})", downloadable.filename).dimmed()
-                    );
+                    ));
                     {
                         let mut to_download = to_download.force_lock();
                         to_download.push(downloadable);
@@ -74,18 +83,27 @@ pub async fn upgrade(
                     if let upgrade::Error::ModrinthError(ferinth::Error::RateLimitExceeded(_)) = err
                     {
                         // Immediately fail if there is a rate limit
+                        progress_bar.finish_and_clear();
                         bail!(err);
                     }
-                    eprintln!("{}", format!("{} {:45} {}", CROSS, mod_.name, err).red());
+                    progress_bar.println(format!(
+                        "{}",
+                        format!("{} {:45} {}", CROSS, mod_.name, err).red()
+                    ));
                     error.store(true, Ordering::Relaxed);
                 },
             }
+            progress_bar.inc(1);
             Ok(())
         }));
     }
     for handle in tasks {
         handle.await??;
     }
+    Arc::try_unwrap(progress_bar)
+        .expect("Failed to run threads to completion")
+        .into_inner()?
+        .finish_and_clear();
     let mut to_download = Arc::try_unwrap(to_download)
         .expect("Failed to run threads to completion")
         .into_inner()?;
@@ -137,10 +155,17 @@ pub async fn upgrade(
         println!("\n{}", "All up to date!".bold());
     } else {
         println!("\n{}\n", "Downloading Mod Files".bold());
+        let progress_bar = Arc::new(Mutex::new(
+            ProgressBar::new(to_download.len() as u64).with_style(STYLE.clone()),
+        ));
+        {
+            progress_bar.force_lock().enable_steady_tick(100);
+        }
         let mut tasks = Vec::new();
         for downloadable in to_download {
-            let profile = profile.clone();
+            let progress_bar = progress_bar.clone();
             let downloadable = downloadable.clone();
+            let profile = profile.clone();
             tasks.push(spawn(async move {
                 let contents = reqwest::get(&downloadable.download_url)
                     .await?
@@ -149,18 +174,24 @@ pub async fn upgrade(
                 let size = Size::Bytes(contents.len());
                 check::write_mod_file(&profile.output_dir, contents, &downloadable.filename)
                     .await?;
-                println!(
+                let progress_bar = progress_bar.force_lock();
+                progress_bar.println(format!(
                     "{} Downloaded {:7} {}",
                     &*TICK,
                     size.to_string(Base::Base10, Style::Smart),
                     downloadable.filename.dimmed(),
-                );
+                ));
+                progress_bar.inc(1);
                 Ok::<(), Error>(())
             }));
         }
         for handle in tasks {
             handle.await??;
         }
+        Arc::try_unwrap(progress_bar)
+            .expect("Failed to run threads to completion")
+            .into_inner()?
+            .finish_and_clear();
         for installable in to_install {
             eprint!(
                 "Installing  {}... ",