feat: add interactive search
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-09-22 11:48:29 +02:00
parent d0a5da0946
commit 5401f3707d
5 changed files with 412 additions and 27 deletions

View File

@@ -25,6 +25,7 @@ prost = "0.13.2"
prost-types = "0.13.2"
bytes = "1.7.1"
nucleo-matcher = "0.3.1"
ratatui = "0.28.1"
[dev-dependencies]
pretty_assertions = "1.4.0"

View File

@@ -5,6 +5,7 @@ use crate::{
cache::CacheApp,
fuzzy_matcher::{FuzzyMatcher, FuzzyMatcherApp},
git_provider::Repository,
interactive::InteractiveApp,
projects_list::ProjectsListApp,
};
@@ -32,23 +33,29 @@ impl RootCommand {
repositories
}
};
let needle = match search {
Some(needle) => needle.into(),
None => todo!(),
};
match search {
Some(needle) => {
let matched_repos = self
.app
.fuzzy_matcher()
.match_repositories(&needle.into(), &repositories);
let matched_repos = self
.app
.fuzzy_matcher()
.match_repositories(&needle, &repositories);
let res = matched_repos.iter().take(10).rev().collect::<Vec<_>>();
let repo = matched_repos
.first()
.ok_or(anyhow::anyhow!("failed to find repository"))?;
tracing::info!("selected repo: {}", repo.to_rel_path().display());
}
None => {
let repo = self
.app
.interactive()
.interactive_search(&repositories)?
.ok_or(anyhow::anyhow!("failed to find a repository"))?;
for repo in res {
tracing::debug!("repo: {:?}", repo);
tracing::info!("selected repo: {}", repo.to_rel_path().display());
}
}
tracing::info!("amount of repos fetched {}", repositories.len());
Ok(())
}
}
@@ -69,7 +76,7 @@ impl StringExt for Vec<&String> {
}
}
trait RepositoryMatcher {
pub trait RepositoryMatcher {
fn match_repositories(&self, pattern: &str, repositories: &[Repository]) -> Vec<Repository>;
}

View File

@@ -0,0 +1,160 @@
use app::App;
use crate::git_provider::Repository;
pub struct Interactive {
app: &'static crate::app::App,
}
impl Interactive {
pub fn new(app: &'static crate::app::App) -> Self {
Self { app }
}
pub fn interactive_search(
&mut self,
repositories: &[Repository],
) -> anyhow::Result<Option<Repository>> {
let terminal = ratatui::init();
let app_result = App::new(self.app, repositories).run(terminal);
ratatui::restore();
app_result
}
}
pub trait InteractiveApp {
fn interactive(&self) -> Interactive;
}
impl InteractiveApp for &'static crate::app::App {
fn interactive(&self) -> Interactive {
Interactive::new(self)
}
}
mod app {
use ratatui::{
crossterm::event::{self, Event, KeyCode},
layout::{Constraint, Layout},
style::{Style, Stylize},
text::{Line, Span, Text},
widgets::{ListItem, ListState, Paragraph, StatefulWidget},
DefaultTerminal, Frame,
};
use crate::{
commands::root::RepositoryMatcher, fuzzy_matcher::FuzzyMatcherApp, git_provider::Repository,
};
pub struct App<'a> {
app: &'static crate::app::App,
repositories: &'a [Repository],
current_search: String,
matched_repos: Vec<Repository>,
list: ListState,
}
impl<'a> App<'a> {
pub fn new(app: &'static crate::app::App, repositories: &'a [Repository]) -> Self {
Self {
app,
repositories,
current_search: String::default(),
matched_repos: Vec::default(),
list: ListState::default(),
}
}
fn update_matched_repos(&mut self) {
let mut res = self
.app
.fuzzy_matcher()
.match_repositories(&self.current_search, self.repositories);
//res.reverse();
self.matched_repos = res;
if self.list.selected().is_none() {
self.list.select_first();
}
}
pub fn run(mut self, mut terminal: DefaultTerminal) -> anyhow::Result<Option<Repository>> {
self.update_matched_repos();
loop {
terminal.draw(|frame| self.draw(frame))?;
if let Event::Key(key) = event::read()? {
match key.code {
KeyCode::Char(letter) => {
self.current_search.push(letter);
self.update_matched_repos();
}
KeyCode::Backspace => {
if !self.current_search.is_empty() {
let _ = self.current_search.remove(self.current_search.len() - 1);
self.update_matched_repos();
}
}
KeyCode::Esc => return Ok(None),
KeyCode::Enter => {
if let Some(selected) = self.list.selected() {
if let Some(repo) = self.matched_repos.iter().nth(selected).cloned()
{
return Ok(Some(repo));
}
}
return Ok(None);
}
KeyCode::Up => self.list.select_next(),
KeyCode::Down => self.list.select_previous(),
_ => {}
}
}
}
}
fn draw(&mut self, frame: &mut Frame) {
let vertical = Layout::vertical([Constraint::Percentage(100), Constraint::Min(1)]);
let [repository_area, input_area] = vertical.areas(frame.area());
let repos = &self.matched_repos;
let repo_items = repos
.iter()
.map(|r| r.to_rel_path().display().to_string())
.collect::<Vec<_>>();
let repo_list_items = repo_items
.into_iter()
.map(ListItem::from)
.collect::<Vec<_>>();
let repo_list = ratatui::widgets::List::new(repo_list_items)
.direction(ratatui::widgets::ListDirection::BottomToTop)
.scroll_padding(3)
.highlight_symbol("> ")
.highlight_spacing(ratatui::widgets::HighlightSpacing::Always)
.highlight_style(Style::default().bold().white());
StatefulWidget::render(
repo_list,
repository_area,
frame.buffer_mut(),
&mut self.list,
);
let input = Paragraph::new(Line::from(vec![
Span::from("> ").blue(),
Span::from(self.current_search.as_str()),
Span::from(" ").on_white(),
]));
frame.render_widget(input, input_area);
}
}
}

View File

@@ -14,6 +14,7 @@ mod commands;
mod config;
mod fuzzy_matcher;
mod git_provider;
mod interactive;
mod projects_list;
#[derive(Parser)]