proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-05-29 22:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

proxmox/src/api/cli/text_table.rs - format_object: use column_config header

Browse Source 
Also right_align Value column if all properthies are right_aligned.
This commit is contained in:
Dietmar Maurer 2020-02-27 11:10:02 +01:00
parent 43fd868a6d
commit 875f00bb85
1 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
proxmox/src/api/cli/text_table.rs
View File

@ -276,6 +276,28 @@ impl TableFormatOptions {
self.column_config.push(column_config); self.column_config.push(column_config);
self self
} }
fn lookup_column_info(&self, column_name: &str) -> (String, Option<bool>, Option<RenderFunction>) {
let mut renderer = None;
let header;
let mut right_align = None;
if let Some(column_config) = self.column_config.iter().find(|v| v.name == *column_name) {
renderer = column_config.renderer;
right_align = column_config.right_align;
if let Some(ref h) = column_config.header {
header = h.to_owned();
} else {
header = column_name.to_string();
}
} else {
header = column_name.to_string();
}
(header, right_align, renderer)
}
} }
struct TableCell { struct TableCell {
@ -381,28 +403,16 @@ fn format_table<W: Write>(
None => bail!("property {} does not exist in schema.", name), None => bail!("property {} does not exist in schema.", name),
}; };
let mut right_align = match prop_schema { let is_numeric = match prop_schema {
Schema::Integer(_) => true, Schema::Integer(_) => true,
Schema::Number(_) => true, Schema::Number(_) => true,
Schema::Boolean(_) => true, Schema::Boolean(_) => true,
_ => false, _ => false,
}; };
let mut renderer = None; let (header, right_align, renderer) = options.lookup_column_info(name);
let header; let right_align = right_align.unwrap_or(is_numeric);
if let Some(column_config) = options.column_config.iter().find(|v| v.name == *name) {
renderer = column_config.renderer;
right_align = column_config.right_align.unwrap_or(right_align);
if let Some(ref h) = column_config.header {
header = h.to_owned();
} else {
header = name.to_string();
}
} else {
header = name.to_string();
}
let mut max_width = header.chars().count(); let mut max_width = header.chars().count();
@ -549,21 +559,31 @@ fn format_object<W: Write>(
let mut name_cells = Vec::new(); let mut name_cells = Vec::new();
let mut value_cells = Vec::new(); let mut value_cells = Vec::new();
let mut all_right_aligned = true;
for name in properties_to_print.iter() { for name in properties_to_print.iter() {
let (_optional, prop_schema) = match schema.lookup(name) { let (_optional, prop_schema) = match schema.lookup(name) {
Some(tup) => tup, Some(tup) => tup,
None => bail!("property {} does not exist in schema.", name), None => bail!("property {} does not exist in schema.", name),
}; };
let mut renderer = None; let is_numeric = match prop_schema {
if let Some(column_config) = options.column_config.iter().find(|v| v.name == *name) { Schema::Integer(_) => true,
renderer = column_config.renderer; Schema::Number(_) => true,
} Schema::Boolean(_) => true,
_ => false,
};
let name_width = name.chars().count(); let (header, right_align, renderer) = options.lookup_column_info(name);
if name_width > max_name_width { max_name_width = name_width; }
name_cells.push(TableCell { lines: vec![ name.to_string() ] }); let right_align = right_align.unwrap_or(is_numeric);
if !right_align { all_right_aligned = false; }
let header_width = header.chars().count();
if header_width > max_name_width { max_name_width = header_width; }
name_cells.push(TableCell { lines: vec![ header ] });
let result = if let Some(renderer) = renderer { let result = if let Some(renderer) = renderer {
(renderer)(&data[name], &data) (renderer)(&data[name], &data)
@ -586,7 +606,7 @@ fn format_object<W: Write>(
} }
let name_column = TableColumn { cells: name_cells, width: max_name_width, right_align: false }; let name_column = TableColumn { cells: name_cells, width: max_name_width, right_align: false };
let value_column = TableColumn { cells: value_cells, width: max_value_width, right_align: false }; let value_column = TableColumn { cells: value_cells, width: max_value_width, right_align: all_right_aligned };
let mut tabledata: Vec<TableColumn> = Vec::new(); let mut tabledata: Vec<TableColumn> = Vec::new();
tabledata.push(name_column); tabledata.push(name_column);