Continuation of Add search bar at bottom of revlog #506

README.md

@@ -47,7 +47,7 @@
 - Stashing (save, pop, apply, drop, and inspect)
 - Push/Fetch to/from remote
 - Branch List (create, rename, delete, checkout, remotes)
-- Browse commit log, diff committed changes
+- Browse commit log, diff committed changes, search/filter commits
 - Scalable terminal UI layout
 - Async git API for fluid control
 

asyncgit/src/revlog.rs

@@ -27,6 +27,7 @@ pub enum FetchStatus {
 }
 
 ///
+#[derive(Clone)]
 pub struct AsyncLog {
     current: Arc<Mutex<Vec<CommitId>>>,
     sender: Sender<AsyncNotification>,

asyncgit/src/sync/commits_info.rs

@@ -48,7 +48,7 @@ impl From<Oid> for CommitId {
 }
 
 ///
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct CommitInfo {
     ///
     pub message: String,

asyncgit/src/tags.rs

@@ -22,6 +22,7 @@ struct TagsResult {
 }
 
 ///
+#[derive(Clone)]
 pub struct AsyncTags {
     last: Arc<Mutex<Option<(Instant, TagsResult)>>>,
     sender: Sender<AsyncNotification>,

src/app.rs

@@ -571,6 +571,9 @@ impl App {
                 self.push_tags_popup.push_tags()?;
                 flags.insert(NeedsUpdate::ALL)
             }
+            InternalEvent::FilterLog(string_to_filter_by) => {
+                self.revlog.filter(&string_to_filter_by)?
+            }
             InternalEvent::StatusLastFileMoved => {
                 self.status_tab.last_file_moved()?;
             }

src/components/commitlist.rs

@@ -84,8 +84,8 @@ impl CommitList {
     }
 
     ///
-    pub fn set_count_total(&mut self, total: usize) {
-        self.count_total = total;
+    pub fn set_total_count(&mut self, count: usize) {
+        self.count_total = count;
         self.selection =
             cmp::min(self.selection, self.selection_max());
     }

src/components/find_commit.rs

@@ -0,0 +1,119 @@
+use super::{
+    textinput::TextInputComponent, CommandBlocking, CommandInfo,
+    Component, DrawableComponent, EventState,
+};
+use crate::{
+    keys::SharedKeyConfig,
+    queue::{InternalEvent, Queue},
+    strings,
+    ui::style::SharedTheme,
+};
+use anyhow::Result;
+use crossterm::event::Event;
+use tui::{backend::Backend, layout::Rect, Frame};
+
+pub struct FindCommitComponent {
+    input: TextInputComponent,
+    queue: Queue,
+    is_focused: bool,
+    visible: bool,
+    key_config: SharedKeyConfig,
+}
+
+impl DrawableComponent for FindCommitComponent {
+    fn draw<B: Backend>(
+        &self,
+        f: &mut Frame<B>,
+        rect: Rect,
+    ) -> Result<()> {
+        self.input.draw(f, rect)?;
+        Ok(())
+    }
+}
+
+impl Component for FindCommitComponent {
+    fn commands(
+        &self,
+        _out: &mut Vec<CommandInfo>,
+        _force_all: bool,
+    ) -> CommandBlocking {
+        CommandBlocking::PassingOn
+    }
+
+    fn event(&mut self, ev: Event) -> Result<EventState> {
+        if self.is_visible() && self.focused() {
+            if let Event::Key(e) = ev {
+                if e == self.key_config.exit_popup {
+                    // Prevent text input closing
+                    self.focus(false);
+                    self.visible = false;
+                    return Ok(EventState::Consumed);
+                }
+            }
+            if self.input.event(ev)?.is_consumed() {
+                self.queue.borrow_mut().push_back(
+                    InternalEvent::FilterLog(
+                        self.input.get_text().to_string(),
+                    ),
+                );
+                return Ok(EventState::Consumed);
+            }
+        }
+        Ok(EventState::NotConsumed)
+    }
+
+    fn is_visible(&self) -> bool {
+        self.visible
+    }
+
+    fn hide(&mut self) {
+        self.visible = false;
+    }
+    fn show(&mut self) -> Result<()> {
+        self.visible = true;
+        Ok(())
+    }
+
+    fn focus(&mut self, focus: bool) {
+        self.is_focused = focus;
+    }
+
+    fn focused(&self) -> bool {
+        self.is_focused
+    }
+
+    fn toggle_visible(&mut self) -> Result<()> {
+        self.visible = !self.visible;
+        Ok(())
+    }
+}
+
+impl FindCommitComponent {
+    ///
+    pub fn new(
+        queue: Queue,
+        theme: SharedTheme,
+        key_config: SharedKeyConfig,
+    ) -> Self {
+        let mut input_component = TextInputComponent::new(
+            theme,
+            key_config.clone(),
+            &strings::find_commit_title(&key_config),
+            &strings::find_commit_msg(&key_config),
+            false,
+        );
+        input_component.show().expect("Will not error");
+        input_component.set_should_use_rect(true);
+        Self {
+            queue,
+            input: input_component,
+            key_config,
+            visible: false,
+            is_focused: false,
+        }
+    }
+
+    pub fn clear_input(&mut self) {
+        self.input.clear();
+    }
+}

src/components/mod.rs

@@ -10,6 +10,7 @@ mod cred;
 mod diff;
 mod externaleditor;
 mod filetree;
+mod find_commit;
 mod help;
 mod inspect_commit;
 mod msg;
@@ -35,6 +36,7 @@ pub use create_branch::CreateBranchComponent;
 pub use diff::DiffComponent;
 pub use externaleditor::ExternalEditorComponent;
 pub use filetree::FileTreeComponent;
+pub use find_commit::FindCommitComponent;
 pub use help::HelpComponent;
 pub use inspect_commit::InspectCommitComponent;
 pub use msg::MsgComponent;
@@ -47,6 +49,7 @@ pub use revision_files::RevisionFilesComponent;
 pub use stashmsg::StashMsgComponent;
 pub use tag_commit::TagCommitComponent;
 pub use textinput::{InputType, TextInputComponent};
+pub use utils::async_commit_filter;
 pub use utils::filetree::FileTreeItemKind;
 
 use crate::ui::style::Theme;

src/components/textinput.rs

@@ -39,6 +39,7 @@ pub struct TextInputComponent {
     key_config: SharedKeyConfig,
     cursor_position: usize,
     input_type: InputType,
+    should_use_rect: bool,
     current_area: Cell<Rect>,
 }
 
@@ -61,6 +62,7 @@ impl TextInputComponent {
             default_msg: default_msg.to_string(),
             cursor_position: 0,
             input_type: InputType::Multiline,
+            should_use_rect: false,
             current_area: Cell::new(Rect::default()),
         }
     }
@@ -241,6 +243,10 @@ impl TextInputComponent {
             f.render_widget(w, rect);
         }
     }
+
+    pub fn set_should_use_rect(&mut self, b: bool) {
+        self.should_use_rect = b;
+    }
 }
 
 // merges last line of `txt` with first of `append` so we do not generate unneeded newlines
@@ -267,7 +273,7 @@ impl DrawableComponent for TextInputComponent {
     fn draw<B: Backend>(
         &self,
         f: &mut Frame<B>,
-        _rect: Rect,
+        rect: Rect,
     ) -> Result<()> {
         if self.visible {
             let txt = if self.msg.is_empty() {
@@ -279,16 +285,21 @@ impl DrawableComponent for TextInputComponent {
                 self.get_draw_text()
             };
 
-            let area = match self.input_type {
-                InputType::Multiline => {
-                    let area = ui::centered_rect(60, 20, f.size());
-                    ui::rect_inside(
-                        Size::new(10, 3),
-                        f.size().into(),
-                        area,
-                    )
+            let area = if self.should_use_rect {
+                rect
+            } else {
+                match self.input_type {
+                    InputType::Multiline => {
+                        let area =
+                            ui::centered_rect(60, 20, f.size());
+                        ui::rect_inside(
+                            Size::new(10, 3),
+                            f.size().into(),
+                            area,
+                        )
+                    }
+                    _ => ui::centered_rect_absolute(32, 3, f.size()),
                 }
-                _ => ui::centered_rect_absolute(32, 3, f.size()),
             };
 
             f.render_widget(Clear, area);