Skip to content

fix(core.api.client): aggregate fetch_all_mods errors #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BinToss wants to merge 2 commits into
base: omega
Choose a base branch
from
+21 −9
Open

fix(core.api.client): aggregate fetch_all_mods errors #55

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4292bbe
fix(core.api.client): print fetch_all_mods errors after it completes
BinToss Apr 18, 2026
b284cfa
refactor(core.api.client): print errors w/ different `error!` arm
BinToss May 2, 2026
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
30 changes: 21 additions & 9 deletions rustique-core/src/api/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,7 @@ impl ApiClient {
pb.set_message("Fetching mods...");

// Create a vector to hold all our task handles
let mut tasks: Vec<JoinHandle<Option<(ModID, Mod)>>> = Vec::with_capacity(valid_ids.len());

let mut tasks: Vec<JoinHandle<Result<(ModID, Mod), String>>> = Vec::with_capacity(valid_ids.len());
// Spawn a task for each mod
for (i, mod_id) in valid_ids.into_iter().enumerate() {
info!("ModID: {}", mod_id);
Expand All @@ -183,13 +182,15 @@ impl ApiClient {
Ok(the_mod) => {
pb_clone.set_message(mod_id.to_string());
pb_clone.inc(1);
Some((mod_id, the_mod))
Ok((mod_id, the_mod))
},
Err(e) => {
error!("{mod_id} {e}");
pb_clone.set_message(format!("Failed: {}", mod_id.red()));
pb_clone.inc(1);
None
Err(format!(
"Failed: {0}\nError:\n{1}\n",
&mod_id.red(),
&e.to_string().red()
))
}
}
});
Expand All @@ -205,12 +206,23 @@ impl ApiClient {
let results_vec = join_all(tasks).await;
// Wait for all tasks to complete and collect results
let mut results = HashMap::new();
for (mod_id, mod_info) in results_vec.into_iter().flatten().flatten() {
// Handle any JoinError from the task itself
results.insert(mod_id, mod_info);
let mut error_messages: Vec<String> = Vec::with_capacity(results_vec.len());
for result in results_vec.into_iter().flatten() {
match result {
Ok((mod_id, mod_info)) => {
// Handle any JoinError from the task itself
results.insert(mod_id, mod_info);
}
Err(error_message) => {
error_messages.push(error_message);
}
}
}

pb.finish_with_message("Fetch Complete");
for err in error_messages.iter() {
error!("{}", err);
}
Ok(results)
}

Expand Down
Loading