Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions hyperdrive/packages/app-store/downloads/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -459,14 +459,33 @@ fn handle_message(
return Ok(());
};

let download_from = metadata.properties.mirrors
let mut mirror_candidates: Vec<String> = Vec::new();
let mut seen = HashSet::new();

if !metadata.properties.publisher.is_empty()
&& seen.insert(metadata.properties.publisher.clone())
{
mirror_candidates.push(metadata.properties.publisher.clone());
}

for mirror in &metadata.properties.mirrors {
if mirror.is_empty() {
continue;
}
if seen.insert(mirror.clone()) {
mirror_candidates.push(mirror.clone());
}
}

let download_from = mirror_candidates
.first()
.ok_or_else(||
.ok_or_else(|| {
anyhow::anyhow!(
"auto_update: error for package_id: {}, current_version: {}, no mirrors found",
process_lib_package_id.to_string(), current_version
process_lib_package_id.to_string(),
current_version
)
)?
})?
.to_string();

print_to_terminal(
Expand All @@ -479,10 +498,15 @@ fn handle_message(

// Initialize auto-update status with mirrors
let key = (process_lib_package_id.clone(), version_hash.clone());
let mirrors_left = if mirror_candidates.len() > 1 {
mirror_candidates[1..].to_vec()
} else {
Vec::new()
};
auto_updates.insert(
key,
AutoUpdateStatus {
mirrors_left: metadata.properties.mirrors[1..].to_vec(),
mirrors_left,
mirrors_failed: Vec::new(),
active_mirror: download_from.clone(),
},
Expand Down Expand Up @@ -642,21 +666,21 @@ fn try_next_mirror(
metadata
.mirrors_failed
.push((metadata.active_mirror.clone(), error));
metadata.mirrors_left = metadata.mirrors_left[1..].to_vec();

let (package_id, version_hash) = key.clone();

match metadata.mirrors_left.iter().next().cloned() {
match metadata.mirrors_left.first().cloned() {
Some(next_mirror) => {
metadata.active_mirror = next_mirror.clone();
metadata.mirrors_left.remove(0);
auto_updates.insert(key, metadata);
Request::to(("our", "downloads", "app-store", "sys"))
.body(
serde_json::to_vec(&DownloadRequest::LocalDownload(LocalDownloadRequest {
package_id: crate::hyperware::process::main::PackageId::from_process_lib(
package_id,
),
download_from: next_mirror,
download_from: next_mirror.clone(),
desired_version_hash: version_hash.clone(),
}))
.unwrap(),
Expand Down