eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Merge commit '81ec068747a39e927c42273011252daaa58f1e14' into feature-clean

Browse Source
This commit is contained in:
didirus4
2024-12-26 16:51:17 +03:00
parent 69bbbb30e2 81ec068747
commit 7bbc79c6a1
361 changed files with 25873 additions and 23923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/app-lib/src/util/fetch.rs
View File

@@ -112,6 +112,19 @@ pub async fn fetch_advanced(
let result = req.send().await;
match result {
Ok(x) => {
if x.status().is_server_error() {
if attempt <= FETCH_ATTEMPTS {
continue;
} else {
return Err(crate::Error::from(
crate::ErrorKind::OtherError(
"Server error when fetching content"
.to_string(),
),
));
}
}
let bytes = if let Some((bar, total)) = &loading_bar {
let length = x.content_length();
if let Some(total_size) = length {
@@ -145,7 +158,7 @@ pub async fn fetch_advanced(
if let Some(sha1) = sha1 {
let hash = sha1_async(bytes.clone()).await?;
if &*hash != sha1 {
if attempt <= 3 {
if attempt <= FETCH_ATTEMPTS {
continue;
} else {
return Err(crate::ErrorKind::HashError(
@@ -159,13 +172,13 @@ pub async fn fetch_advanced(
tracing::trace!("Done downloading URL {url}");
return Ok(bytes);
} else if attempt <= 3 {
} else if attempt <= FETCH_ATTEMPTS {
continue;
} else if let Err(err) = bytes {
return Err(err.into());
}
}
Err(_) if attempt <= 3 => continue,
Err(_) if attempt <= FETCH_ATTEMPTS => continue,
Err(err) => {
return Err(err.into());
}