Skip to content

Commit

Permalink
feat: make --show-proxy-command work
Browse files Browse the repository at this point in the history 
Signed-off-by: Nathanael DEMACON <[email protected]>
  • Loading branch information
@quantumsheep
quantumsheep committed Feb 21, 2024
1 parent b0460e6 commit 339d12e
Show file tree
Hide file tree
Showing 3 changed files with 130 additions and 89 deletions.
4 changes: 4 additions & 0 deletions src/searchable.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ where
self.filtered.is_empty()
}

pub fn non_filtered_iter(&self) -> std::slice::Iter<T> {
self.vec.iter()
}

pub fn iter(&self) -> std::slice::Iter<T> {
self.filtered.iter()
}
Expand Down
2 changes: 2 additions & 0 deletions src/ssh.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ pub struct Host {
pub user: Option<String>,
pub destination: String,
pub port: Option<String>,
pub proxy_command: Option<String>,
}

impl Host {
Expand Down Expand Up @@ -70,6 +71,7 @@ pub fn parse_config(raw_path: &String) -> Result<Vec<Host>, Box<dyn Error>> {
.get(&ssh_config::EntryType::Hostname)
.unwrap_or_default(),
port: host.get(&ssh_config::EntryType::Port),
proxy_command: host.get(&ssh_config::EntryType::ProxyCommand),
})
.collect();

Expand Down
213 changes: 124 additions & 89 deletions src/ui.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pub struct App {

table_state: TableState,
hosts: Searchable<ssh::Host>,
table_longest_item_lens: (u16, u16, u16, u16, u16),
table_columns_constraints: Vec<Constraint>,

palette: tailwind::Palette,
}
Expand All @@ -57,16 +57,15 @@ impl App {
}

let search_input = config.search_filter.clone().unwrap_or_default();

let matcher = SkimMatcherV2::default();

Ok(App {
let mut app = App {
config: config.clone(),

search: search_input.clone().into(),

table_state: TableState::default().with_selected(0),
table_longest_item_lens: constraint_len_calculator(&hosts),
table_columns_constraints: Vec::new(),
palette: tailwind::BLUE,

hosts: Searchable::new(
Expand All @@ -78,7 +77,10 @@ impl App {
|| matcher.fuzzy_match(&host.aliases, search_value).is_some()
},
),
})
};
app.calculate_table_columns_constraints();

Ok(app)
}

/// # Errors
Expand Down Expand Up @@ -195,6 +197,86 @@ impl App {
};
self.table_state.select(Some(i));
}

fn calculate_table_columns_constraints(&mut self) {
let mut lengths = Vec::new();

let name_len = self
.hosts
.iter()
.map(|d| d.name.as_str())
.map(UnicodeWidthStr::width)
.max()
.unwrap_or(0);
lengths.push(name_len);

let aliases_len = self
.hosts
.non_filtered_iter()
.map(|d| d.aliases.as_str())
.map(UnicodeWidthStr::width)
.max()
.unwrap_or(0);
lengths.push(aliases_len);

let user_len = self
.hosts
.non_filtered_iter()
.map(|d| match &d.user {
Some(user) => user.as_str(),
None => "",
})
.map(UnicodeWidthStr::width)
.max()
.unwrap_or(0);
lengths.push(user_len);

let destination_len = self
.hosts
.non_filtered_iter()
.map(|d| d.destination.as_str())
.map(UnicodeWidthStr::width)
.max()
.unwrap_or(0);
lengths.push(destination_len);

let port_len = self
.hosts
.non_filtered_iter()
.map(|d| match &d.port {
Some(port) => port.as_str(),
None => "",
})
.map(UnicodeWidthStr::width)
.max()
.unwrap_or(0);
lengths.push(port_len);

if self.config.show_proxy_command {
let proxy_len = self
.hosts
.non_filtered_iter()
.map(|d| match &d.proxy_command {
Some(proxy) => proxy.as_str(),
None => "",
})
.map(UnicodeWidthStr::width)
.max()
.unwrap_or(0);
lengths.push(proxy_len);
}

let mut new_constraints = vec![
// +1 for padding
Constraint::Length(u16::try_from(lengths[0]).unwrap_or_default() + 1),
];
new_constraints.extend(
lengths
.iter()
.skip(1)
.map(|len| Constraint::Min(u16::try_from(*len).unwrap_or_default() + 1)),
);
}
}

fn setup_terminal<B: Backend>(terminal: &Rc<RefCell<Terminal<B>>>) -> Result<(), Box<dyn Error>>
Expand Down Expand Up @@ -269,7 +351,12 @@ fn render_table(f: &mut Frame, app: &mut App, area: Rect) {
let header_style = Style::default().fg(tailwind::CYAN.c500);
let selected_style = Style::default().add_modifier(Modifier::REVERSED);

let header = ["Name", "Aliases", "User", "Destination", "Port"]
let mut header_names = vec!["Name", "Aliases", "User", "Destination", "Port"];
if app.config.show_proxy_command {
header_names.push("Proxy");
}

let header = header_names
.iter()
.copied()
.map(Cell::from)
Expand All @@ -278,96 +365,44 @@ fn render_table(f: &mut Frame, app: &mut App, area: Rect) {
.height(1);

let rows = app.hosts.iter().map(|host| {
[
&host.name,
&host.aliases,
&host.user.as_ref().unwrap_or(&String::new()),
&host.destination,
&host.port.as_ref().unwrap_or(&String::new()),
]
.iter()
.copied()
.map(|content| Cell::from(Text::from(content.to_string())))
.collect::<Row>()
let mut content = vec![
host.name.clone(),
host.aliases.clone(),
host.user.clone().unwrap_or_default(),
host.destination.clone(),
host.port.clone().unwrap_or_default(),
];
if app.config.show_proxy_command {
content.push(host.proxy_command.clone().unwrap_or_default());
}

content
.iter()
.map(|content| Cell::from(Text::from(content.to_string())))
.collect::<Row>()
});

let bar = " █ ";
let t = Table::new(
rows,
[
// + 1 is for padding.
Constraint::Length(app.table_longest_item_lens.0 + 1),
Constraint::Min(app.table_longest_item_lens.1 + 1),
Constraint::Min(app.table_longest_item_lens.2 + 1),
Constraint::Min(app.table_longest_item_lens.3 + 1),
Constraint::Min(app.table_longest_item_lens.4 + 1),
],
)
.header(header)
.highlight_style(selected_style)
.highlight_symbol(Text::from(vec![
"".into(),
bar.into(),
bar.into(),
"".into(),
]))
.highlight_spacing(HighlightSpacing::Always)
.block(
Block::default()
.borders(Borders::ALL)
.border_style(Style::new().fg(app.palette.c400))
.border_type(BorderType::Rounded),
);
let t = Table::new(rows, app.table_columns_constraints.clone())
.header(header)
.highlight_style(selected_style)
.highlight_symbol(Text::from(vec![
"".into(),
bar.into(),
bar.into(),
"".into(),
]))
.highlight_spacing(HighlightSpacing::Always)
.block(
Block::default()
.borders(Borders::ALL)
.border_style(Style::new().fg(app.palette.c400))
.border_type(BorderType::Rounded),
);

f.render_stateful_widget(t, area, &mut app.table_state);
}

fn constraint_len_calculator(items: &[ssh::Host]) -> (u16, u16, u16, u16, u16) {
let name_len = items
.iter()
.map(|d| d.name.as_str())
.map(UnicodeWidthStr::width)
.max()
.unwrap_or(0);
let aliases_len = items
.iter()
.map(|d| d.aliases.as_str())
.map(UnicodeWidthStr::width)
.max()
.unwrap_or(0);
let user_len = items
.iter()
.map(|d| match &d.user {
Some(user) => user.as_str(),
None => "",
})
.map(UnicodeWidthStr::width)
.max()
.unwrap_or(0);
let destination_len = items
.iter()
.map(|d| d.destination.as_str())
.map(UnicodeWidthStr::width)
.max()
.unwrap_or(0);
let port_len = items
.iter()
.map(|d| match &d.port {
Some(port) => port.as_str(),
None => "",
})
.map(UnicodeWidthStr::width)
.max()
.unwrap_or(0);
(
u16::try_from(name_len).unwrap_or_default(),
u16::try_from(aliases_len).unwrap_or_default(),
u16::try_from(user_len).unwrap_or_default(),
u16::try_from(destination_len).unwrap_or_default(),
u16::try_from(port_len).unwrap_or_default(),
)
}

fn render_footer(f: &mut Frame, app: &mut App, area: Rect) {
let info_footer = Paragraph::new(Line::from(INFO_TEXT)).centered().block(
Block::default()
Expand Down

0 comments on commit 339d12e

Please sign in to comment.