RGBCube/dix
1
Fork 0
mirror of https://github.com/RGBCube/dix synced 2025-07-28 12:17:45 +00:00
Code Issues Activity

main: add basic column alignment to printed output

Browse source
This commit is contained in:
Dragyx 2025-05-05 11:15:09 +02:00
parent 955a710812
commit 7afce21ff8
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main.rs
View file

@ -536,11 +536,13 @@ fn print_added(set: HashSet<&str>, post: &HashMap<&str, HashSet<&str>>) {
// Sort by package name for consistent output // Sort by package name for consistent output
sorted.sort_by(|(a, _), (b, _)| a.cmp(b)); sorted.sort_by(|(a, _), (b, _)| a.cmp(b));
// make the columns as wide as the widest package name
let col_width = set.iter().map(|p| p.len()).max().unwrap_or_default();
for (p, ver) in sorted { for (p, ver) in sorted {
let version_str = ver.iter().copied().collect::<Vec<_>>().join(" "); let version_str = ver.iter().copied().collect::<Vec<_>>().join(" ");
println!( println!(
"{} {} {} {}", "{} {:col_width$} {} {}",
"[A:]".green().bold(), "[A:]".green().bold(),
p, p,
"@".yellow().bold(), "@".yellow().bold(),
@ -561,10 +563,13 @@ fn print_removed(set: HashSet<&str>, pre: &HashMap<&str, HashSet<&str>>) {
// Sort by package name for consistent output // Sort by package name for consistent output
sorted.sort_by(|(a, _), (b, _)| a.cmp(b)); sorted.sort_by(|(a, _), (b, _)| a.cmp(b));
// make the columns as wide as the widest package name
let col_width = set.iter().map(|p| p.len()).max().unwrap_or_default();
for (p, ver) in sorted { for (p, ver) in sorted {
let version_str = ver.iter().copied().collect::<Vec<_>>().join(" "); let version_str = ver.iter().copied().collect::<Vec<_>>().join(" ");
println!( println!(
"{} {} {} {}", "{} {:col_width$} {} {}",
"[R:]".red().bold(), "[R:]".red().bold(),
p, p,
"@".yellow(), "@".yellow(),
@ -583,10 +588,14 @@ fn print_changes(
// Use sorted output for more predictable and readable results // Use sorted output for more predictable and readable results
let mut changes = Vec::new(); let mut changes = Vec::new();
// make the column as wide as the longest package name
let mut col_width = 0;
for p in set.iter().filter(|p| !p.is_empty()) { for p in set.iter().filter(|p| !p.is_empty()) {
if let (Some(ver_pre), Some(ver_post)) = (pre.get(p), post.get(p)) { if let (Some(ver_pre), Some(ver_post)) = (pre.get(p), post.get(p)) {
if ver_pre != ver_post { if ver_pre != ver_post {
changes.push((*p, ver_pre, ver_post)); changes.push((*p, ver_pre, ver_post));
col_width = std::cmp::max(col_width, p.len());
} }
} }
} }
@ -599,7 +608,7 @@ fn print_changes(
let version_str_post = ver_post.iter().copied().collect::<Vec<_>>().join(", "); let version_str_post = ver_post.iter().copied().collect::<Vec<_>>().join(", ");
println!( println!(
"{} {} {} {} ~> {}", "{} {:col_width$} {} {} ~> {}",
"[C:]".bold().bright_yellow(), "[C:]".bold().bright_yellow(),
p, p,
"@".yellow(), "@".yellow(),