Improve error messages during sync errors

Closes #46
This commit is contained in:
2022-12-12 15:21:38 +01:00
parent 7d131bbacf
commit 38bba1472e
2 changed files with 15 additions and 11 deletions

View File

@@ -38,7 +38,7 @@ fn main() {
}
}
Err(error) => {
print_error(&format!("Error syncing trees: {}", error));
print_error(&format!("Sync error: {}", error));
process::exit(1);
}
}
@@ -62,7 +62,7 @@ fn main() {
match provider::Github::new(filter, token, args.api_url) {
Ok(provider) => provider,
Err(error) => {
print_error(&format!("Error: {}", error));
print_error(&format!("Sync error: {}", error));
process::exit(1);
}
}
@@ -76,7 +76,7 @@ fn main() {
match provider::Gitlab::new(filter, token, args.api_url) {
Ok(provider) => provider,
Err(error) => {
print_error(&format!("Error: {}", error));
print_error(&format!("Sync error: {}", error));
process::exit(1);
}
}
@@ -112,13 +112,13 @@ fn main() {
}
}
Err(error) => {
print_error(&format!("Error syncing trees: {}", error));
print_error(&format!("Sync error: {}", error));
process::exit(1);
}
}
}
Err(error) => {
print_error(&format!("Error: {}", error));
print_error(&format!("Sync error: {}", error));
process::exit(1);
}
}

View File

@@ -270,12 +270,16 @@ pub trait Provider {
}
for group in &self.filter().groups {
let group_projects = self
.get_group_projects(group)
.map_err(|error| match error {
ApiErrorResponse::Json(x) => x.to_string(),
ApiErrorResponse::String(s) => s,
})?;
let group_projects = self.get_group_projects(group).map_err(|error| {
format!(
"group \"{}\": {}",
group,
match error {
ApiErrorResponse::Json(x) => x.to_string(),
ApiErrorResponse::String(s) => s,
}
)
})?;
for group_project in group_projects {
let mut already_present = false;
for repo in &repos {