cfsctl: Switch to comfy_table

So we get correct line wrapping.

Signed-off-by: Colin Walters <walters@verbum.org>
Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Signed-off-by: Colin Walters <walters@verbum.org>

Author: cgwalters

crates/cfsctl/Cargo.toml

@@ -21,6 +21,7 @@ rhel9 = ['composefs/rhel9']
 anyhow = { version = "1.0.87", default-features = false }
 fn-error-context = "0.2"
 clap = { version = "4.5.0", default-features = false, features = ["std", "help", "usage", "derive", "wrap_help"] }
+comfy-table = { version = "7.1", default-features = false }
 composefs = { workspace = true }
 composefs-boot = { workspace = true }
 composefs-oci = { workspace = true, optional = true }

crates/cfsctl/src/main.rs

@@ -13,6 +13,7 @@ use std::{
 
 use anyhow::Result;
 use clap::{Parser, Subcommand, ValueEnum};
+use comfy_table::{presets::UTF8_FULL, Table};
 
 use rustix::fs::CWD;
 
@@ -427,10 +428,10 @@ where
                 } else if images.is_empty() {
                     println!("No images found");
                 } else {
-                    println!(
-                        "{:<30} {:<12} {:<10} {:<8} {:<6} {:<5}",
-                        "NAME", "DIGEST", "ARCH", "SEALED", "LAYERS", "REFS"
-                    );
+                    let mut table = Table::new();
+                    table.load_preset(UTF8_FULL);
+                    table.set_header(["NAME", "DIGEST", "ARCH", "SEALED", "LAYERS", "REFS"]);
+
                     for img in images {
                         let digest_short = img
                             .manifest_digest
@@ -441,20 +442,22 @@ where
                         } else {
                             digest_short
                         };
-                        println!(
-                            "{:<30} {:<12} {:<10} {:<8} {:<6} {:<5}",
-                            img.name,
+                        let arch = if img.architecture.is_empty() {
+                            "artifact"
+                        } else {
+                            &img.architecture
+                        };
+                        let sealed = if img.sealed { "yes" } else { "no" };
+                        table.add_row([
+                            img.name.as_str(),
                             digest_display,
-                            if img.architecture.is_empty() {
-                                "artifact"
-                            } else {
-                                &img.architecture
-                            },
-                            if img.sealed { "yes" } else { "no" },
-                            img.layer_count,
-                            img.referrer_count
-                        );
+                            arch,
+                            sealed,
+                            &img.layer_count.to_string(),
+                            &img.referrer_count.to_string(),
+                        ]);
                     }
+                    println!("{table}");
                 }
             }
             OciCommand::Inspect {