From 1114112ba8d22772fff8f2470452b1319fb102e2 Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Tue, 13 Aug 2024 17:29:31 +0200 Subject: [PATCH] bin: Use generic browser state in `patch select` --- bin/commands/patch/select.rs | 81 +++++++-------------------------- bin/commands/patch/select/ui.rs | 14 +++--- 2 files changed, 23 insertions(+), 72 deletions(-) diff --git a/bin/commands/patch/select.rs b/bin/commands/patch/select.rs index 5e157d53..48b4c1b6 100644 --- a/bin/commands/patch/select.rs +++ b/bin/commands/patch/select.rs @@ -30,7 +30,8 @@ use self::ui::{Browser, BrowserProps}; use super::common::{Mode, PatchOperation}; use crate::cob::patch; -use crate::ui::items::{Filter, PatchItem, PatchItemFilter}; +use crate::ui::items::{PatchItem, PatchItemFilter}; +use crate::ui::widget::BrowserState; type Selection = tui::Selection; @@ -51,37 +52,6 @@ pub enum AppPage { Help, } -#[derive(Clone, Debug)] -pub struct BrowserState { - items: Vec, - selected: Option, - filter: PatchItemFilter, - search: store::StateValue, - show_search: bool, -} - -impl BrowserState { - pub fn patches(&self) -> Vec { - self.items - .iter() - .filter(|patch| self.filter.matches(patch)) - .cloned() - .collect() - } - - pub fn patches_ref(&self) -> Vec<&PatchItem> { - self.items - .iter() - .filter(|patch| self.filter.matches(patch)) - .collect() - } - - pub fn selected_item(&self) -> Option<&PatchItem> { - self.selected - .and_then(|selected| self.patches_ref().get(selected).copied()) - } -} - #[derive(Clone, Debug)] pub struct HelpState { text: TextViewState, @@ -91,7 +61,7 @@ pub struct HelpState { pub struct State { mode: Mode, pages: PageStack, - browser: BrowserState, + browser: BrowserState, help: HelpState, } @@ -115,13 +85,7 @@ impl TryFrom<&Context> for State { Ok(Self { mode: context.mode.clone(), pages: PageStack::new(vec![AppPage::Browse]), - browser: BrowserState { - items, - selected: Some(0), - filter, - search, - show_search: false, - }, + browser: BrowserState::build(items.clone(), filter, search), help: HelpState { text: TextViewState::default().content(help_text()), }, @@ -133,7 +97,7 @@ pub enum Message { Quit, Exit { operation: Option }, ExitFromMode, - Select { selected: Option }, + SelectPatch { selected: Option }, OpenSearch, UpdateSearch { value: String }, ApplySearch, @@ -170,47 +134,34 @@ impl store::State for State { }), }) } - Message::Select { selected } => { - self.browser.selected = selected; + Message::SelectPatch { selected } => { + self.browser.select_item(selected); None } Message::OpenSearch => { - self.browser.show_search = true; + self.browser.show_search(); None } Message::UpdateSearch { value } => { - self.browser.search.write(value); - self.browser.filter = - PatchItemFilter::from_str(&self.browser.search.read()).unwrap_or_default(); - - if let Some(selected) = self.browser.selected { - if selected > self.browser.patches().len() { - self.browser.selected = Some(0); - } - } - + self.browser.update_search(value); + self.browser.select_first_item(); None } Message::ApplySearch => { - self.browser.search.apply(); - self.browser.show_search = false; + self.browser.hide_search(); + self.browser.apply_search(); None } Message::CloseSearch => { - self.browser.search.reset(); - self.browser.show_search = false; - self.browser.filter = - PatchItemFilter::from_str(&self.browser.search.read()).unwrap_or_default(); - + self.browser.hide_search(); + self.browser.reset_search(); None } Message::OpenHelp => { - log::warn!("OpenHelp"); self.pages.push(AppPage::Help); None } Message::LeavePage => { - log::warn!("LeavePage"); self.pages.pop(); None } @@ -257,7 +208,7 @@ fn browser_page(_state: &State, channel: &Channel) -> Widget) -> Widget From<&State> for BrowserProps<'a> { let mut archived = 0; let mut merged = 0; - let patches = state.browser.patches(); + let patches = state.browser.items(); for patch in &patches { match patch.state { @@ -105,8 +105,8 @@ impl<'a> From<&State> for BrowserProps<'a> { Column::new("Updated", Constraint::Length(16)).hide_small(), ] .to_vec(), - show_search: state.browser.show_search, - search: state.browser.search.read(), + show_search: state.browser.is_search_shown(), + search: state.browser.read_search(), } } } @@ -136,7 +136,7 @@ impl Browser { .on_event(|_, s, _| { let (selected, _) = s.and_then(|s| s.unwrap_table()).unwrap_or_default(); - Some(Message::Select { + Some(Message::SelectPatch { selected: Some(selected), }) }) @@ -145,8 +145,8 @@ impl Browser { let props = BrowserProps::from(state); TableProps::default() .columns(props.columns) - .items(state.browser.patches()) - .selected(state.browser.selected) + .items(state.browser.items()) + .selected(state.browser.selected()) .to_boxed_any() .into() }), @@ -176,7 +176,7 @@ impl Browser { }) .on_update(|state: &State| { TextFieldProps::default() - .text(&state.browser.search.read().to_string()) + .text(&state.browser.read_search()) .title("Search") .inline(true) .to_boxed_any()