Reapply "feat: limit tum table width length (#380)" (#388) (#392)

* Reapply "feat: limit tum table width length (#380)" (#388)

* Fix if tum table limit length > terminal length

Author: eatradish

Cargo.lock

@@ -13,8 +13,8 @@ authors = ["eatradish <[email protected]>"]
 clap = { version = "4.5.19", features = ["cargo", "wrap_help", "color", "derive", "env"] }
 anyhow = "1.0.89"
 ctrlc = "3.4.5"
-tabled = { version = "0.18.0", features = ["ansi"] }
 dialoguer = "0.11.0"
+tabled = { version = "0.19", features = ["ansi"] }
 tokio = "1.40.0"
 oma-inquire = "0.2"
 serde = { version = "1.0.210", features = ["derive"] }

Cargo.toml

@@ -121,7 +121,7 @@ impl CliExecuter for CommandNotFound {
                     );
                     let mut printer = PagerPrinter::new(stdout());
                     printer
-                        .print_table(res, vec!["Name", "Path", "Description"])
+                        .print_table(res, vec!["Name", "Path", "Description"], None)
                         .ok();
 
                     if too_many {

src/subcommand/command_not_found.rs

@@ -508,7 +508,11 @@ pub fn speedtest(
     success!("{}\n", fl!("speedtest-complete"));
 
     printer
-        .print_table(score_table, vec![&fl!("mirror-name"), &fl!("mirror-score")])
+        .print_table(
+            score_table,
+            vec![&fl!("mirror-name"), &fl!("mirror-score")],
+            None,
+        )
         .ok();
 
     if set_fastest {

src/subcommand/mirror.rs

@@ -282,7 +282,12 @@ impl<W: Write> PagerPrinter<W> {
         writeln!(self.writer, "{d}")
     }
 
-    pub fn print_table<T, I>(&mut self, table: I, header: Vec<&str>) -> std::io::Result<()>
+    pub fn print_table<T, I>(
+        &mut self,
+        table: I,
+        header: Vec<&str>,
+        len: Option<usize>,
+    ) -> std::io::Result<()>
     where
         I: IntoIterator<Item = T>,
         T: Tabled,
@@ -294,13 +299,21 @@ impl<W: Write> PagerPrinter<W> {
             t.build()
         };
 
+        let mut display_len = WRITER.get_length() as usize;
+
+        if let Some(len) = len {
+            if display_len > len {
+                display_len = len;
+            }
+        }
+
         table
             .with(Padding::new(2, 2, 0, 0))
             .with(Alignment::left())
             .modify(Columns::new(2..3), Alignment::left())
             .with(Style::psql())
             .with(
-                Width::wrap(WRITER.get_length() as usize)
+                Width::wrap(display_len)
                     .priority(PriorityMax::left())
                     .keep_words(true),
             );
@@ -483,6 +496,7 @@ fn print_pending_inner<W: Write>(
                     fl!("table-size").as_str(),
                     fl!("table-detail").as_str(),
                 ],
+                None,
             )
             .ok();
         printer.println("\n").ok();
@@ -512,6 +526,7 @@ fn print_pending_inner<W: Write>(
                         fl!("table-version").as_str(),
                         fl!("table-size").as_str(),
                     ],
+                    None,
                 )
                 .ok();
             printer.println("\n").ok();
@@ -540,6 +555,7 @@ fn print_pending_inner<W: Write>(
                         fl!("table-version").as_str(),
                         fl!("table-size").as_str(),
                     ],
+                    None,
                 )
                 .ok();
             printer.println("\n").ok();
@@ -568,6 +584,7 @@ fn print_pending_inner<W: Write>(
                         fl!("table-version").as_str(),
                         fl!("table-size").as_str(),
                     ],
+                    None,
                 )
                 .ok();
             printer.println("\n").ok();
@@ -596,6 +613,7 @@ fn print_pending_inner<W: Write>(
                         fl!("table-version").as_str(),
                         fl!("table-size").as_str(),
                     ],
+                    None,
                 )
                 .ok();
             printer.println("\n").ok();
@@ -725,6 +743,7 @@ fn print_tum(
             .print_table(
                 tum_display,
                 vec![fl!("tum-name").as_str(), fl!("tum-notes").as_str()],
+                Some(80),
             )
             .ok();
         printer.println("").ok();