asp/keep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fix cell alignment method chaining issue

Browse Source 
Co-authored-by: aider (openai/andrew/openrouter/qwen/qwen3-coder) <aider@aider.chat>
This commit is contained in:
Andrew Phillips
2025-08-16 13:44:53 -03:00
parent db808bb794
commit 4f61306d79
1 changed files with 93 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

173
src/modes/list.rs
View File

@@ -120,122 +120,135 @@ pub fn mode_list(
let cell = match column_type { let cell = match column_type {
ColumnType::Id => { ColumnType::Id => {
let mut cell = Cell::new(&string_column(item.id.unwrap_or(0).to_string(), column_width));
match column.align { match column.align {
crate::config::ColumnAlignment::Right => Cell::new(&string_column(item.id.unwrap_or(0).to_string(), column_width)).align(Alignment::RIGHT), crate::config::ColumnAlignment::Right => { cell.align(Alignment::RIGHT); },
crate::config::ColumnAlignment::Left => Cell::new(&string_column(item.id.unwrap_or(0).to_string(), column_width)).align(Alignment::LEFT), crate::config::ColumnAlignment::Left => { cell.align(Alignment::LEFT); },
} }
cell
}, },
ColumnType::Time => { ColumnType::Time => {
let mut cell = Cell::new(&string_column(
item.ts
.with_timezone(&chrono::Local)
.format("%F %T")
.to_string(),
column_width,
));
match column.align { match column.align {
crate::config::ColumnAlignment::Right => Cell::new(&string_column( crate::config::ColumnAlignment::Right => { cell.align(Alignment::RIGHT); },
item.ts crate::config::ColumnAlignment::Left => { cell.align(Alignment::LEFT); },
.with_timezone(&chrono::Local)
.format("%F %T")
.to_string(),
column_width,
)).align(Alignment::RIGHT),
crate::config::ColumnAlignment::Left => Cell::new(&string_column(
item.ts
.with_timezone(&chrono::Local)
.format("%F %T")
.to_string(),
column_width,
)).align(Alignment::LEFT),
} }
cell
}, },
ColumnType::Size => { ColumnType::Size => {
match column.align { let cell = match item.size {
crate::config::ColumnAlignment::Right => match item.size { Some(size) => {
Some(size) => Cell::new(&size_column(size as u64, settings.human_readable, column_width)).align(Alignment::RIGHT), let mut cell = Cell::new(&size_column(size as u64, settings.human_readable, column_width));
None => match item_path.metadata() { match column.align {
crate::config::ColumnAlignment::Right => { cell.align(Alignment::RIGHT); },
crate::config::ColumnAlignment::Left => { cell.align(Alignment::LEFT); },
}
cell
},
None => {
let mut cell = match item_path.metadata() {
Ok(_) => Cell::new("Unknown") Ok(_) => Cell::new("Unknown")
.with_style(Attr::ForegroundColor(color::YELLOW)) .with_style(Attr::ForegroundColor(color::YELLOW))
.with_style(Attr::Bold) .with_style(Attr::Bold),
.align(Alignment::RIGHT),
Err(_) => Cell::new("Missing") Err(_) => Cell::new("Missing")
.with_style(Attr::ForegroundColor(color::RED)) .with_style(Attr::ForegroundColor(color::RED))
.with_style(Attr::Bold) .with_style(Attr::Bold),
.align(Alignment::RIGHT), };
}, match column.align {
crate::config::ColumnAlignment::Right => { cell.align(Alignment::RIGHT); },
crate::config::ColumnAlignment::Left => { cell.align(Alignment::LEFT); },
}
cell
}, },
crate::config::ColumnAlignment::Left => match item.size { };
Some(size) => Cell::new(&size_column(size as u64, settings.human_readable, column_width)).align(Alignment::LEFT), cell
None => match item_path.metadata() {
Ok(_) => Cell::new("Unknown")
.with_style(Attr::ForegroundColor(color::YELLOW))
.with_style(Attr::Bold)
.align(Alignment::LEFT),
Err(_) => Cell::new("Missing")
.with_style(Attr::ForegroundColor(color::RED))
.with_style(Attr::Bold)
.align(Alignment::LEFT),
},
},
}
}, },
ColumnType::Compression => { ColumnType::Compression => {
let mut cell = Cell::new(&string_column(item.compression.to_string(), column_width));
match column.align { match column.align {
crate::config::ColumnAlignment::Right => Cell::new(&string_column(item.compression.to_string(), column_width)).align(Alignment::RIGHT), crate::config::ColumnAlignment::Right => { cell.align(Alignment::RIGHT); },
crate::config::ColumnAlignment::Left => Cell::new(&string_column(item.compression.to_string(), column_width)).align(Alignment::LEFT), crate::config::ColumnAlignment::Left => { cell.align(Alignment::LEFT); },
} }
cell
}, },
ColumnType::FileSize => { ColumnType::FileSize => {
match column.align { let cell = match item_path.metadata() {
crate::config::ColumnAlignment::Right => match item_path.metadata() { Ok(metadata) => {
Ok(metadata) => Cell::new(&size_column(metadata.len(), settings.human_readable, column_width)).align(Alignment::RIGHT), let mut cell = Cell::new(&size_column(metadata.len(), settings.human_readable, column_width));
Err(_) => Cell::new("Missing") match column.align {
.with_style(Attr::ForegroundColor(color::RED)) crate::config::ColumnAlignment::Right => { cell.align(Alignment::RIGHT); },
.with_style(Attr::Bold) crate::config::ColumnAlignment::Left => { cell.align(Alignment::LEFT); },
.align(Alignment::RIGHT), }
cell
}, },
crate::config::ColumnAlignment::Left => match item_path.metadata() { Err(_) => {
Ok(metadata) => Cell::new(&size_column(metadata.len(), settings.human_readable, column_width)).align(Alignment::LEFT), let mut cell = Cell::new("Missing")
Err(_) => Cell::new("Missing")
.with_style(Attr::ForegroundColor(color::RED)) .with_style(Attr::ForegroundColor(color::RED))
.with_style(Attr::Bold) .with_style(Attr::Bold);
.align(Alignment::LEFT), match column.align {
crate::config::ColumnAlignment::Right => { cell.align(Alignment::RIGHT); },
crate::config::ColumnAlignment::Left => { cell.align(Alignment::LEFT); },
}
cell
}, },
} };
cell
}, },
ColumnType::FilePath => { ColumnType::FilePath => {
let mut cell = Cell::new(&string_column(
item_path.clone().into_os_string().into_string().unwrap(),
column_width,
));
match column.align { match column.align {
crate::config::ColumnAlignment::Right => Cell::new(&string_column( crate::config::ColumnAlignment::Right => { cell.align(Alignment::RIGHT); },
item_path.clone().into_os_string().into_string().unwrap(), crate::config::ColumnAlignment::Left => { cell.align(Alignment::LEFT); },
column_width,
)).align(Alignment::RIGHT),
crate::config::ColumnAlignment::Left => Cell::new(&string_column(
item_path.clone().into_os_string().into_string().unwrap(),
column_width,
)).align(Alignment::LEFT),
} }
cell
}, },
ColumnType::Tags => { ColumnType::Tags => {
let mut cell = Cell::new(&string_column(tags.join(" "), column_width));
match column.align { match column.align {
crate::config::ColumnAlignment::Right => Cell::new(&string_column(tags.join(" "), column_width)).align(Alignment::RIGHT), crate::config::ColumnAlignment::Right => { cell.align(Alignment::RIGHT); },
crate::config::ColumnAlignment::Left => Cell::new(&string_column(tags.join(" "), column_width)).align(Alignment::LEFT), crate::config::ColumnAlignment::Left => { cell.align(Alignment::LEFT); },
} }
cell
}, },
ColumnType::Meta => { ColumnType::Meta => {
match column.align { let cell = match meta_name {
crate::config::ColumnAlignment::Right => match meta_name { Some(meta_name) => match meta.get(meta_name) {
Some(meta_name) => match meta.get(meta_name) { Some(meta_value) => {
Some(meta_value) => { let mut cell = Cell::new(&string_column(meta_value.to_string(), column_width));
Cell::new(&string_column(meta_value.to_string(), column_width)).align(Alignment::RIGHT) match column.align {
crate::config::ColumnAlignment::Right => { cell.align(Alignment::RIGHT); },
crate::config::ColumnAlignment::Left => { cell.align(Alignment::LEFT); },
} }
None => Cell::new("").align(Alignment::RIGHT), cell
}, }
None => Cell::new("").align(Alignment::RIGHT), None => {
}, let mut cell = Cell::new("");
crate::config::ColumnAlignment::Left => match meta_name { match column.align {
Some(meta_name) => match meta.get(meta_name) { crate::config::ColumnAlignment::Right => { cell.align(Alignment::RIGHT); },
Some(meta_value) => { crate::config::ColumnAlignment::Left => { cell.align(Alignment::LEFT); },
Cell::new(&string_column(meta_value.to_string(), column_width)).align(Alignment::LEFT)
} }
None => Cell::new("").align(Alignment::LEFT), cell
}, },
None => Cell::new("").align(Alignment::LEFT),
}, },
} None => {
let mut cell = Cell::new("");
match column.align {
crate::config::ColumnAlignment::Right => { cell.align(Alignment::RIGHT); },
crate::config::ColumnAlignment::Left => { cell.align(Alignment::LEFT); },
}
cell
},
};
cell
}, },
}; };
table_row.add_cell(cell); table_row.add_cell(cell);