Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Refactor ProgressiveTable to separate construction and rendering
Maximilian Roosbe938023905e
diff --git a/src/commands/list/collect.rs b/src/commands/list/collect.rsindex a49084841..971bcf79a 100644--- a/src/commands/list/collect.rs+++ b/src/commands/list/collect.rs@@ -682,12 +682,14 @@ pub fn collect(let initial_footer = format!("{INFO_EMOJI} {dim}{footer_base} (loading...){dim:#}");- Some(ProgressiveTable::new(+ let table = ProgressiveTable::new(layout.format_header_line(),skeletons,initial_footer,max_width,- )?)+ );+ table.render_initial()?;+ Some(table)} else {None};diff --git a/src/commands/list/progressive_table.rs b/src/commands/list/progressive_table.rsindex d251d16c3..e9b56e2ee 100644--- a/src/commands/list/progressive_table.rs+++ b/src/commands/list/progressive_table.rs@@ -38,6 +38,8 @@ pub struct ProgressiveTable {impl ProgressiveTable {/// Create a new progressive table with the given structure.///+ /// Call `render_initial()` after construction to print the initial table.+ ////// # Arguments/// * `header` - The header line content/// * `skeletons` - Initial content for each data row (skeleton with known data)@@ -48,7 +50,7 @@ impl ProgressiveTable {skeletons: Vec<String>,initial_footer: String,max_width: usize,- ) -> std::io::Result<Self> {+ ) -> Self {let is_tty = stderr().is_terminal();let row_count = skeletons.len();@@ -66,19 +68,20 @@ impl ProgressiveTable {// Footerlines.push(truncate_visible(&initial_footer, max_width, "…"));- let table = Self {+ Self {lines,max_width,row_count,is_tty,- };-- // Print initial table- if is_tty {- table.print_all()?;}+ }- Ok(table)+ /// Print the initial table to stderr (TTY only).+ pub fn render_initial(&self) -> std::io::Result<()> {+ if self.is_tty {+ self.print_all()?;+ }+ Ok(())}/// Print all lines to stderr.@@ -212,17 +215,14 @@ mod tests {use super::*;#[test]- fn builds_and_updates_rows_without_tty_side_effects() {+ fn builds_and_updates_rows() {let header = "header".to_string();let skeletons = vec!["row0".to_string(), "row1".to_string()];let footer = "loading".to_string();+ // new() no longer has I/O side effects — render_initial() must be called explicitlylet mut table =- ProgressiveTable::new(header.clone(), skeletons.clone(), footer.clone(), 80)- .expect("table should build");-- // Force non-TTY behavior to avoid cursor control in tests- table.is_tty = false;+ ProgressiveTable::new(header.clone(), skeletons.clone(), footer.clone(), 80);// header + 2 rows + spacer + footerassert_eq!(table.lines.len(), 5);@@ -247,10 +247,5 @@ mod tests {// Footer updatetable.update_footer("done".into()).unwrap();assert_eq!(table.lines.last().unwrap(), "done");-- // Finalize non-tty path should just print without panicking- table- .finalize_non_tty(vec!["final header".into(), "final row".into()])- .unwrap();}}