update iw4x first
so we don't have to pass the progressbar to iw4x just to not have it break by a little println
This commit is contained in:
parent
9a6b7b531a
commit
17454d4dc8
10
src/iw4x.rs
10
src/iw4x.rs
@ -23,13 +23,21 @@ pub fn update(dir: &Path) {
|
|||||||
let local = local_revision(dir);
|
let local = local_revision(dir);
|
||||||
|
|
||||||
if remote <= local && dir.join("iw4x.dll").exists() {
|
if remote <= local && dir.join("iw4x.dll").exists() {
|
||||||
|
println!(
|
||||||
|
"[{}] No files to download for IW4x",
|
||||||
|
"Info".bright_magenta(),
|
||||||
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
println!(
|
||||||
|
"[{}] Downloading outdated or missing files for IW4x",
|
||||||
|
"Info".bright_magenta()
|
||||||
|
);
|
||||||
println!(
|
println!(
|
||||||
"[{}] {}",
|
"[{}] {}",
|
||||||
"Downloading".bright_yellow(),
|
"Downloading".bright_yellow(),
|
||||||
dir.join("iw4x.dll").display()
|
misc::cute_path(&dir.join("iw4x.dll"))
|
||||||
);
|
);
|
||||||
http::download_file(
|
http::download_file(
|
||||||
&format!(
|
&format!(
|
||||||
|
@ -294,13 +294,13 @@ async fn update(game: &Game<'_>, dir: &Path, bonus_content: bool, force: bool) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let pb = ProgressBar::new(0);
|
|
||||||
update_dir(&cdn_info, game.engine, dir, &mut hashes, &pb).await;
|
|
||||||
|
|
||||||
if game.engine == "iw4" {
|
if game.engine == "iw4" {
|
||||||
iw4x::update(dir);
|
iw4x::update(dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let pb = ProgressBar::new(0);
|
||||||
|
update_dir(&cdn_info, game.engine, dir, &mut hashes, &pb).await;
|
||||||
|
|
||||||
if bonus_content && !game.bonus.is_empty() {
|
if bonus_content && !game.bonus.is_empty() {
|
||||||
for bonus in game.bonus.iter() {
|
for bonus in game.bonus.iter() {
|
||||||
update_dir(&cdn_info, bonus, dir, &mut hashes, &pb).await;
|
update_dir(&cdn_info, bonus, dir, &mut hashes, &pb).await;
|
||||||
|
Loading…
Reference in New Issue
Block a user