alterware/alterware-launcher
1
0
Fork 0
mirror of https://github.com/alterware/alterware-launcher.git synced 2025-12-04 07:17:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup http

Browse Source
This commit is contained in:
mxve
2024-09-06 03:45:11 +02:00
parent e92de11fb3
commit b181cde007
1 changed files with 25 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/http_async.rs
View File

@@ -20,7 +20,7 @@ pub async fn download_file_progress(
.get(url) .get(url)
.header( .header(
"User-Agent", "User-Agent",
&format!( format!(
"AlterWare Launcher | github.com/{}/{}", "AlterWare Launcher | github.com/{}/{}",
crate::global::GH_OWNER, crate::global::GH_OWNER,
crate::global::GH_REPO crate::global::GH_REPO
@@ -28,10 +28,11 @@ pub async fn download_file_progress(
) )
.send() .send()
.await .await
.or(Err(format!("Failed to GET from '{url}'")))?; .map_err(|_| format!("Failed to GET from '{url}'"))?;
// Fix for CF shenanigans
let total_size = res.content_length().unwrap_or(size); let total_size = res.content_length().unwrap_or(size);
pb.set_length(total_size); pb.set_length(total_size);
let msg = format!( let msg = format!(
"{}{} ({})", "{}{} ({})",
misc::prefix("downloading"), misc::prefix("downloading"),
@@ -43,21 +44,17 @@ pub async fn download_file_progress(
pb.set_message(path.file_name().unwrap().to_str().unwrap().to_string()); pb.set_message(path.file_name().unwrap().to_str().unwrap().to_string());
let mut file = let mut file =
File::create(path).or(Err(format!("Failed to create file '{}'", path.display())))?; File::create(path).map_err(|_| format!("Failed to create file '{}'", path.display()))?;
let mut downloaded: u64 = 0; let mut downloaded: u64 = 0;
let mut stream = res.bytes_stream(); let mut stream = res.bytes_stream();
while let Some(item) = stream.next().await { while let Some(item) = stream.next().await {
let chunk = match item { let chunk = item.map_err(|e| format!("Error while downloading file: {e}"))?;
Ok(v) => v, file.write_all(&chunk)
Err(e) => return Err(format!("Error while downloading file: {e}")), .map_err(|e| format!("Error while writing to file: {e}"))?;
};
if let Err(e) = file.write_all(&chunk) { downloaded = min(downloaded + (chunk.len() as u64), total_size);
Err(format!("Error while writing to file: {e}"))? pb.set_position(downloaded);
}
let new = min(downloaded + (chunk.len() as u64), total_size);
downloaded = new;
pb.set_position(new);
} }
pb.set_message(String::default()); pb.set_message(String::default());
@@ -65,40 +62,19 @@ pub async fn download_file_progress(
} }
pub async fn download_file(url: &str, path: &PathBuf) -> Result<(), String> { pub async fn download_file(url: &str, path: &PathBuf) -> Result<(), String> {
let client = Client::new(); let body = get_body(url).await?;
match client
.get(url)
.header(
"User-Agent",
&format!(
"AlterWare Launcher | github.com/{}/{}",
crate::global::GH_OWNER,
crate::global::GH_REPO
),
)
.send()
.await
{
Ok(res) => {
let body = res.bytes().await.or(Err("Failed to download file"))?;
let mut file = File::create(path).or(Err("Failed to create file"))?; let mut file = File::create(path).or(Err("Failed to create file"))?;
file.write_all(&body).or(Err("Failed to write to file"))?; file.write_all(&body).or(Err("Failed to write to file"))?;
Ok(()) Ok(())
}
Err(e) => {
misc::fatal_error(&e.to_string());
Err("Could not download file".to_string())
}
}
} }
pub async fn get_body(url: &str) -> Result<Vec<u8>, String> { pub async fn get_body(url: &str) -> Result<Vec<u8>, String> {
let client = Client::new(); let client = Client::new();
match client let res = client
.get(url) .get(url)
.header( .header(
"User-Agent", "User-Agent",
&format!( format!(
"AlterWare Launcher | github.com/{}/{}", "AlterWare Launcher | github.com/{}/{}",
crate::global::GH_OWNER, crate::global::GH_OWNER,
crate::global::GH_REPO crate::global::GH_REPO
@@ -106,17 +82,14 @@ pub async fn get_body(url: &str) -> Result<Vec<u8>, String> {
) )
.send() .send()
.await .await
{ .map_err(|e| format!("Failed to send request: {}", e))?;
Ok(res) => {
debug!("{} {url}", res.status().to_string()); debug!("{} {url}", res.status());
let body = res.bytes().await.or(Err("Failed to get body"))?;
Ok(body.to_vec()) res.bytes()
} .await
Err(e) => { .map(|b| b.to_vec())
misc::fatal_error(&e.to_string()); .map_err(|e| format!("Failed to get body: {}", e))
Err("Could not get body".to_string())
}
}
} }
pub async fn get_body_string(url: &str) -> Result<String, String> { pub async fn get_body_string(url: &str) -> Result<String, String> {