From 814cf8ed3659b5e8246454011588e0a177cf2a6c Mon Sep 17 00:00:00 2001
From: marceline-cramer <cramermarceline@gmail.com>
Date: Tue, 30 Nov 2021 16:09:38 -0700
Subject: [PATCH] Dynamic progress messages + TODOs

---
 Cargo.lock  |  8 ++++----
 Cargo.toml  |  2 +-
 src/main.rs | 21 ++++++---------------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 07f23d4..0190247 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -429,9 +429,9 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.16.2"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b"
+checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4"
 dependencies = [
  "console",
  "lazy_static",
@@ -578,9 +578,9 @@ dependencies = [
 
 [[package]]
 name = "number_prefix"
-version = "0.4.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a"
 
 [[package]]
 name = "once_cell"
diff --git a/Cargo.toml b/Cargo.toml
index 4b50691..dab2667 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ confy = "0.4"
 console = "0.15.0"
 dialoguer = "0.9.0"
 futures-util = "0.3.18"
-indicatif = "0.16.2"
+indicatif = "0.15.0"
 reqwest = { version = "0.11", features = ["json", "stream"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
diff --git a/src/main.rs b/src/main.rs
index b9f3f89..eb8dc72 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,6 +8,7 @@ use std::path::PathBuf;
 use structopt::StructOpt;
 
 // TODO use ColoredHelp by default?
+// TODO move each enum value to a dedicated struct
 #[derive(StructOpt, Clone, Debug)]
 enum Command {
     /// Adds a mod to the current instance
@@ -24,6 +25,7 @@ enum Command {
     Clean,
 }
 
+// TODO move main body argument fields to substruct for ease of moving?
 #[derive(StructOpt, Clone, Debug)]
 #[structopt(name = "hopper", setting = structopt::clap::AppSettings::ColoredHelp)]
 struct Args {
@@ -306,27 +308,23 @@ async fn download_version_file(ctx: &AppContext, file: &ModVersionFile) -> anyho
         }
     }
 
-    // TODO check hashes while streaming
-
     let client = reqwest::Client::new();
     let url = &file.url;
     let response = client.get(url).send().await?;
     let total_size = response.content_length().unwrap();
 
+    // TODO better colors and styling!
     use indicatif::{ProgressBar, ProgressStyle};
     let pb = ProgressBar::new(total_size);
     pb.set_style(ProgressStyle::default_bar().template("{msg}\n{spinner:.green} [{elapsed_precise}] [{wide_bar:.cyan/blue}] {bytes}/{total_bytes} ({bytes_per_sec}, {eta})").progress_chars("#>-"));
-
-    // TODO find a way to into -> impl Into<Cow<'static, str>>
-    // let message = format!("Downloading {}", url);
-    let message = "Downloading file";
-    pb.set_message(message);
+    pb.set_message(&format!("Downloading {}", url));
 
     let filename = &file.filename;
     let mut file = std::fs::File::create(filename)?;
     let mut downloaded: u64 = 0;
     let mut stream = response.bytes_stream();
 
+    // TODO check hashes while streaming
     while let Some(item) = stream.next().await {
         let chunk = &item.unwrap();
         file.write(&chunk)?;
@@ -335,11 +333,7 @@ async fn download_version_file(ctx: &AppContext, file: &ModVersionFile) -> anyho
         pb.set_position(new);
     }
 
-    // TODO find a way to into -> impl Into<Cow<'static, str>>
-    // let message = format!("Downloaded {} to {}", url, filename);
-    let message = "Download complete";
-    pb.finish_with_message(message);
-
+    pb.finish_with_message(&format!("Downloaded {} to {}", url, filename));
     Ok(())
 }
 
@@ -363,15 +357,12 @@ async fn cmd_get(ctx: &AppContext, package_name: String) -> anyhow::Result<()> {
 
     for to_get in selected.iter() {
         let mod_info = fetch_mod_info(ctx, to_get).await?;
-        println!("mod: {:#?}", mod_info);
 
         // TODO allow the user to select multiple versions
         if let Some(version_id) = mod_info.versions.first() {
             println!("fetching version {}", version_id);
 
             let version = fetch_mod_version(ctx, version_id).await?;
-            println!("version: {:#?}", version);
-
             for file in version.files.iter() {
                 download_version_file(ctx, file).await?;
             }