Merge pull request #3 from MojaveMF/main

Fixed format being used incorectly
This commit is contained in:
PrintedScript 2023-11-04 19:28:05 +08:00 committed by GitHub
commit 66d814e4a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions

View File

@ -55,11 +55,6 @@ async fn main() {
std::process::Command::new("clear").spawn().unwrap(); std::process::Command::new("clear").spawn().unwrap();
} }
tracing_subscriber::fmt()
.with_max_level(MAX_TRACING_LEVEL)
.pretty()
.init();
let args: Vec<String> = std::env::args().collect(); let args: Vec<String> = std::env::args().collect();
let base_url: &str = "www.syntax.eco"; let base_url: &str = "www.syntax.eco";
let mut setup_url: &str = "setup.syntax.eco"; let mut setup_url: &str = "setup.syntax.eco";
@ -117,6 +112,11 @@ async fn main() {
); );
} }
tracing_subscriber::fmt()
.with_max_level(MAX_TRACING_LEVEL)
.pretty()
.init();
let http_client: Client = reqwest::Client::builder().no_gzip().build().unwrap(); let http_client: Client = reqwest::Client::builder().no_gzip().build().unwrap();
debug!( debug!(
"Setup Server: {} | Base Server: {}", "Setup Server: {} | Base Server: {}",
@ -175,30 +175,31 @@ async fn main() {
let installation_directory = get_installation_directory(); let installation_directory = get_installation_directory();
debug!( debug!(
"Installation Directory: {}", "Instillation Directory: {}",
installation_directory.to_str().unwrap().bright_blue() format!("{:?}", installation_directory.display()).bright_blue()
); );
create_folder_if_not_exists(&installation_directory).await; create_folder_if_not_exists(&installation_directory).await;
let versions_directory = installation_directory.join("Versions"); let versions_directory = installation_directory.join("Versions");
debug!( debug!(
"Versions Directory: {}", "Versions Directory: {}",
versions_directory.to_str().unwrap().bright_blue() format!("{:?}", versions_directory.display()).bright_blue()
); );
create_folder_if_not_exists(&versions_directory).await; create_folder_if_not_exists(&versions_directory).await;
let temp_downloads_directory = installation_directory.join("Downloads"); let temp_downloads_directory = installation_directory.join("Downloads");
debug!( debug!(
"Temp Downloads Directory: {}", "Temp Downloads Directory: {}",
temp_downloads_directory.to_str().unwrap().bright_blue() format!("{:?}", temp_downloads_directory.display()).bright_blue()
); );
create_folder_if_not_exists(&temp_downloads_directory).await; create_folder_if_not_exists(&temp_downloads_directory).await;
let current_version_directory = versions_directory.join(format!("{}", latest_client_version)); let current_version_directory = versions_directory.join(format!("{}", latest_client_version));
debug!( debug!(
"Current Version Directory: {}", "Current Version Directory: {}",
current_version_directory.to_str().unwrap().bright_blue() format!("{:?}", current_version_directory.display()).bright_blue()
); );
create_folder_if_not_exists(&current_version_directory).await; create_folder_if_not_exists(&current_version_directory).await;
let latest_bootstrapper_path = current_version_directory.join(bootstrapper_filename); let latest_bootstrapper_path = current_version_directory.join(bootstrapper_filename);
@ -228,7 +229,7 @@ async fn main() {
match command.spawn() { match command.spawn() {
Ok(_) => {} Ok(_) => {}
Err(e) => { Err(e) => {
debug!(&format!("Bootstrapper errored with error {}", e)); debug!("Bootstrapper errored with error {}", e);
info("Found bootstrapper was corrupted! Downloading..."); info("Found bootstrapper was corrupted! Downloading...");
std::fs::remove_file(latest_bootstrapper_path.clone()).unwrap(); std::fs::remove_file(latest_bootstrapper_path.clone()).unwrap();
download_file( download_file(