refactor: make a with_progressbar function
This commit is contained in:
parent
0a12b87a2a
commit
2aaae9239c
2 changed files with 36 additions and 18 deletions
30
src/main.rs
30
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);
|
||||
pb.set_style(ProgressStyle::default_bar().template(
|
||||
"{bar:40.green/white} {bytes}/{total_bytes} ({bytes_per_sec})",
|
||||
)?);
|
||||
with_progressbar(&start_msg, "download finished", version_detail.downloads.server.size, |pb| async move {
|
||||
let server_bytes = reqwest::get(version_detail.downloads.server.url).await?;
|
||||
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?;
|
||||
let mut file = tokio::fs::File::create("server.jar").await?;
|
||||
let mut stream = server_bytes.bytes_stream();
|
||||
|
||||
while let Some(chunk) = stream.next().await {
|
||||
let chunk = chunk?;
|
||||
file.write_all(&chunk).await?;
|
||||
pb.inc(chunk.len() as u64);
|
||||
}
|
||||
pb.finish_with_message("download finished");
|
||||
while let Some(chunk) = stream.next().await {
|
||||
let chunk = chunk?;
|
||||
file.write_all(&chunk).await?;
|
||||
pb.inc(chunk.len() as u64);
|
||||
}
|
||||
Ok(())
|
||||
}).await?;
|
||||
|
||||
with_spinner("verifying sha1 hash", "sha1 hash verified", || async {
|
||||
let data = tokio::fs::read("server.jar").await?;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue