github/himalaya
1
0
Fork 0
mirror of https://github.com/pimalaya/himalaya.git synced 2026-06-17 13:17:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

implement flowed format POC (#206)

Browse Source
This commit is contained in:
Clément DOUIN
2022-03-03 12:16:59 +01:00
parent 6e5362e76e
commit 613e592f72
10 changed files with 109 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/table.rs
+15 -7
View File
@@ -10,7 +10,10 @@ use termcolor::{Color, ColorSpec};
use terminal_size;
use unicode_width::UnicodeWidthStr;
use crate::output::{Print, PrintTableOpts, WriteColor};
use crate::{
config::Format,
output::{Print, PrintTableOpts, WriteColor},
};
/// Defines the default terminal size.
/// This is used when the size cannot be determined by the `terminal_size` crate.
@@ -164,10 +167,15 @@ where
/// Writes the table to the writter.
fn print(writter: &mut dyn WriteColor, items: &[Self], opts: PrintTableOpts) -> Result<()> {
let max_width = opts
.max_width
.or_else(|| terminal_size::terminal_size().map(|(w, _)| w.0 as usize))
.unwrap_or(DEFAULT_TERM_WIDTH);
let is_format_flowed = matches!(opts.format, Format::Flowed);
let max_width = match opts.format {
Format::Fixed(width) => opts.max_width.unwrap_or(*width),
Format::Flowed => 0,
Format::Auto => opts
.max_width
.or_else(|| terminal_size::terminal_size().map(|(w, _)| w.0 as usize))
.unwrap_or(DEFAULT_TERM_WIDTH),
};
let mut table = vec![Self::head()];
let mut cell_widths: Vec<usize> =
table[0].0.iter().map(|cell| cell.unicode_width()).collect();
@@ -195,7 +203,7 @@ where
glue.print(writter)?;
let table_is_overflowing = table_width > max_width;
if table_is_overflowing && cell.is_shrinkable() {
if table_is_overflowing && !is_format_flowed && cell.is_shrinkable() {
trace!("table is overflowing and cell is shrinkable");
let shrink_width = table_width - max_width;
@@ -329,7 +337,7 @@ mod tests {
macro_rules! write_items {
($writter:expr, $($item:expr),*) => {
Table::print($writter, &[$($item,)*], PrintTableOpts { max_width: Some(20) }).unwrap();
Table::print($writter, &[$($item,)*], PrintTableOpts { format: &Format::Auto, max_width: Some(20) }).unwrap();
};
}