kotovalexarian-likes-gitlab
/
hagrid-keyserver--hagrid
mirror of https://gitlab.com/hagrid-keyserver/hagrid.git
1
0
Fork 0
Code Releases Activity

hagridctl: improve error output during import

This commit is contained in:
Vincent Breitmoser 2019-06-05 18:43:48 +02:00
parent 34d6c48343
commit 89b8b50dd4
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hagridctl/src/import.rs
View File

@ -146,12 +146,20 @@ fn import_from_file(db: &KeyDatabase, input: &Path, multi_progress: &MultiProgre
let input_reader = &mut progress_bar.wrap_read(input_file);
let filename = input.file_name().unwrap().to_string_lossy().to_string();
let mut stats = ImportStats::new(&progress_bar, filename);
let mut stats = ImportStats::new(&progress_bar, filename.clone());
read_file_to_tpks(input_reader, &mut |acc| {
let primary_key = acc[0].clone();
let result = import_key(&db, acc);
if let Err(ref e) = result {
progress_bar.println(e.to_string());
let key_fpr = match primary_key {
Packet::PublicKey(key) => key.fingerprint().to_hex(),
Packet::SecretKey(key) => key.fingerprint().to_hex(),
_ => "Unknown".to_owned(),
};
let error = format!("{}:{:05}:{}: {}\n{}", filename, stats.count_total,
key_fpr, e.to_string(), e.backtrace());
progress_bar.println(error);
}
stats.update(result);
})?;