wojtek/musichoard
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

Do state tracking via types

Browse Source
This commit is contained in:
Wojciech Kozlowski 2024-09-14 22:10:02 +02:00
parent 8acf208968
commit 20f36bcb0e
13 changed files with 113 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tui/app/machine/browse_state.rs
View File

@ -11,7 +11,6 @@ impl AppMachine<BrowseState> {
AppMachine {
inner,
state: BrowseState,
input: None,
}
}
}
@ -27,7 +26,6 @@ impl<'a> From<&'a mut AppMachine<BrowseState>> for AppPublic<'a> {
AppPublic {
inner: (&mut machine.inner).into(),
state: AppState::Browse(()),
input: (&machine.input.as_ref()).map(Into::into),
}
}
}

2
src/tui/app/machine/critical_state.rs
View File

@ -14,7 +14,6 @@ impl AppMachine<CriticalState> {
state: CriticalState {
string: string.into(),
},
input: None
}
}
}
@ -30,7 +29,6 @@ impl<'a> From<&'a mut AppMachine<CriticalState>> for AppPublic<'a> {
AppPublic {
inner: (&mut machine.inner).into(),
state: AppState::Critical(&machine.state.string),
input: (&machine.input.as_ref()).map(Into::into),
}
}
}

2
src/tui/app/machine/error_state.rs
View File

@ -14,7 +14,6 @@ impl AppMachine<ErrorState> {
state: ErrorState {
string: string.into(),
},
input: None,
}
}
}
@ -30,7 +29,6 @@ impl<'a> From<&'a mut AppMachine<ErrorState>> for AppPublic<'a> {
AppPublic {
inner: (&mut machine.inner).into(),
state: AppState::Error(&machine.state.string),
input: (&machine.input.as_ref()).map(Into::into),
}
}
}

7
src/tui/app/machine/fetch_state.rs
View File

@ -40,11 +40,7 @@ pub type FetchReceiver = mpsc::Receiver<FetchResult>;
impl AppMachine<FetchState> {
fn fetch_state(inner: AppInner, state: FetchState) -> Self {
AppMachine {
inner,
state,
input: None,
}
AppMachine { inner, state }
}
pub fn app_fetch_new(inner: AppInner) -> App {
@ -177,7 +173,6 @@ impl<'a> From<&'a mut AppMachine<FetchState>> for AppPublic<'a> {
AppPublic {
inner: (&mut machine.inner).into(),
state: AppState::Fetch(()),
input: (&machine.input.as_ref()).map(Into::into),
}
}
}

2
src/tui/app/machine/info_state.rs
View File

@ -10,7 +10,6 @@ impl AppMachine<InfoState> {
AppMachine {
inner,
state: InfoState,
input: None,
}
}
}
@ -26,7 +25,6 @@ impl<'a> From<&'a mut AppMachine<InfoState>> for AppPublic<'a> {
AppPublic {
inner: (&mut machine.inner).into(),
state: AppState::Info(()),
input: (&machine.input.as_ref()).map(Into::into),
}
}
}

28
src/tui/app/machine/input.rs
View File

@ -1,9 +1,8 @@
use tui_input::backend::crossterm::EventHandler;
use crate::tui::app::{
machine::{App, AppMachine},
IAppInput, InputEvent, InputPublic,
};
use crate::tui::app::{machine::App, AppState, IAppInput, InputEvent, InputPublic};
use super::AppInputMode;
#[derive(Default)]
pub struct Input(tui_input::Input);
@ -14,23 +13,15 @@ impl<'app> From<&'app Input> for InputPublic<'app> {
}
}
impl<State> IAppInput for AppMachine<State>
where
AppMachine<State>: Into<App>,
{
impl IAppInput for AppInputMode {
type APP = App;
fn taking_input(&self) -> bool {
self.input.is_some()
}
fn input(mut self, input: InputEvent) -> Self::APP {
self.input
.as_mut()
.unwrap() // FIXME
.0
.handle_event(&crossterm::event::Event::Key(input));
self.into()
self.app.inner_mut().input.replace(self.input);
self.app
}
fn confirm(self) -> Self::APP {
@ -38,7 +29,10 @@ where
}
fn cancel(mut self) -> Self::APP {
self.input = None;
self.into()
match &mut self.app {
AppState::Match(state) => state.submit_input(self.input),
_ => {}
}
self.app
}
}

11
src/tui/app/machine/match_state.rs
View File

@ -98,12 +98,10 @@ impl MatchState {
impl AppMachine<MatchState> {
pub fn match_state(inner: AppInner, state: MatchState) -> Self {
AppMachine {
inner,
state,
input: None,
}
AppMachine { inner, state }
}
pub fn submit_input(&mut self, _input: Input) {}
}
impl From<AppMachine<MatchState>> for App {
@ -126,7 +124,6 @@ impl<'a> From<&'a mut AppMachine<MatchState>> for AppPublic<'a> {
AppPublic {
inner: (&mut machine.inner).into(),
state: AppState::Match((&mut machine.state).into()),
input: (&machine.input.as_ref()).map(Into::into),
}
}
}
@ -167,7 +164,7 @@ impl IAppInteractMatch for AppMachine<MatchState> {
.unwrap()
.is_manual_input_mbid(index)
{
self.input = Some(Input::default());
self.inner.input = Some(Input::default());
return self.into();
}
}

50
src/tui/app/machine/mod.rs
View File

@ -21,13 +21,12 @@ use critical_state::CriticalState;
use error_state::ErrorState;
use fetch_state::FetchState;
use info_state::InfoState;
use input::Input;
use match_state::MatchState;
use reload_state::ReloadState;
use search_state::SearchState;
use input::Input;
use super::IAppBase;
use super::{AppMode, IAppBase};
pub type App = AppState<
AppMachine<BrowseState>,
@ -43,7 +42,6 @@ pub type App = AppState<
pub struct AppMachine<STATE> {
inner: AppInner,
state: STATE,
input: Option<Input>,
}
pub struct AppInner {
@ -52,6 +50,18 @@ pub struct AppInner {
musicbrainz: Arc<Mutex<dyn IMusicBrainz + Send>>,
selection: Selection,
events: EventSender,
input: Option<Input>,
}
pub struct AppInputMode {
input: Input,
app: App,
}
impl AppInputMode {
fn new(input: Input, app: App) -> Self {
AppInputMode { input, app }
}
}
impl App {
@ -109,6 +119,7 @@ impl IApp for App {
type MatchState = AppMachine<MatchState>;
type ErrorState = AppMachine<ErrorState>;
type CriticalState = AppMachine<CriticalState>;
type InputMode = AppInputMode;
fn is_running(&self) -> bool {
self.inner_ref().running
@ -133,6 +144,28 @@ impl IApp for App {
> {
self
}
fn mode(
mut self,
) -> super::AppMode<
AppState<
Self::BrowseState,
Self::InfoState,
Self::ReloadState,
Self::SearchState,
Self::FetchState,
Self::MatchState,
Self::ErrorState,
Self::CriticalState,
>,
Self::InputMode,
> {
if let Some(input) = self.inner_mut().input.take() {
AppMode::Input(AppInputMode::new(input, self.state()))
} else {
AppMode::Browse(self.state())
}
}
}
impl<T: Into<App>> IAppBase for T {
@ -171,6 +204,7 @@ impl AppInner {
musicbrainz: Arc::new(Mutex::new(musicbrainz)),
selection,
events,
input: None,
}
}
}
@ -180,6 +214,7 @@ impl<'a> From<&'a mut AppInner> for AppPublicInner<'a> {
AppPublicInner {
collection: inner.music_hoard.get_collection(),
selection: &mut inner.selection,
input: inner.input.as_ref().map(Into::into),
}
}
}
@ -408,12 +443,7 @@ mod tests {
let (_, rx) = mpsc::channel();
let inner = app.unwrap_browse().inner;
let state = FetchState::new(rx);
app = AppMachine {
inner,
state,
input: None,
}
.into();
app = AppMachine { inner, state }.into();
let state = app.state();
assert!(matches!(state, AppState::Fetch(_)));

2
src/tui/app/machine/reload_state.rs
View File

@ -11,7 +11,6 @@ impl AppMachine<ReloadState> {
AppMachine {
inner,
state: ReloadState,
input: None,
}
}
}
@ -26,7 +25,6 @@ impl<'a> From<&'a mut AppMachine<ReloadState>> for AppPublic<'a> {
AppPublic {
inner: (&mut machine.inner).into(),
state: AppState::Reload(()),
input: (&machine.input.as_ref()).map(Into::into),
}
}
}

2
src/tui/app/machine/search_state.rs
View File

@ -40,7 +40,6 @@ impl AppMachine<SearchState> {
orig,
memo: vec![],
},
input: None,
}
}
}
@ -56,7 +55,6 @@ impl<'a> From<&'a mut AppMachine<SearchState>> for AppPublic<'a> {
AppPublic {
inner: (&mut machine.inner).into(),
state: AppState::Search(&machine.state.string),
input: (&machine.input.as_ref()).map(Into::into),
}
}
}

34
src/tui/app/mod.rs
View File

@ -28,6 +28,11 @@ pub enum AppState<
Critical(CriticalState),
}
pub enum AppMode<BrowseMode, InputMode> {
Browse(BrowseMode),
Input(InputMode),
}
pub trait IApp {
type BrowseState: IAppBase<APP = Self> + IAppInteractBrowse<APP = Self>;
type InfoState: IAppBase<APP = Self> + IAppInteractInfo<APP = Self>;
@ -36,9 +41,10 @@ pub trait IApp {
type FetchState: IAppBase<APP = Self>
+ IAppInteractFetch<APP = Self>
+ IAppEventFetch<APP = Self>;
type MatchState: IAppBase<APP = Self> + IAppInteractMatch<APP = Self> + IAppInput<APP = Self>;
type MatchState: IAppBase<APP = Self> + IAppInteractMatch<APP = Self>;
type ErrorState: IAppBase<APP = Self> + IAppInteractError<APP = Self>;
type CriticalState: IAppBase<APP = Self>;
type InputMode: IAppInput<APP = Self>;
fn is_running(&self) -> bool;
fn force_quit(self) -> Self;
@ -56,6 +62,23 @@ pub trait IApp {
Self::ErrorState,
Self::CriticalState,
>;
#[allow(clippy::type_complexity)]
fn mode(
self,
) -> AppMode<
AppState<
Self::BrowseState,
Self::InfoState,
Self::ReloadState,
Self::SearchState,
Self::FetchState,
Self::MatchState,
Self::ErrorState,
Self::CriticalState,
>,
Self::InputMode,
>;
}
pub trait IAppBase {
@ -133,8 +156,6 @@ type InputEvent = crossterm::event::KeyEvent;
pub trait IAppInput {
type APP: IApp;
fn taking_input(&self) -> bool;
fn input(self, input: InputEvent) -> Self::APP;
fn confirm(self) -> Self::APP;
fn cancel(self) -> Self::APP;
@ -157,14 +178,16 @@ pub trait IAppAccess {
pub struct AppPublic<'app> {
pub inner: AppPublicInner<'app>,
pub state: AppPublicState<'app>,
pub input: AppPublicInput<'app>,
}
pub struct AppPublicInner<'app> {
pub collection: &'app Collection,
pub selection: &'app mut Selection,
pub input: Option<InputPublic<'app>>,
}
pub type InputPublic<'app> = &'app tui_input::Input;
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum MatchOption<T> {
Match(Match<T>),
@ -242,9 +265,6 @@ impl<
}
}
pub type InputPublic<'app> = &'app tui_input::Input;
pub type AppPublicInput<'app> = Option<InputPublic<'app>>;
#[cfg(test)]
mod tests {
use super::*;

21
src/tui/handler.rs
View File

@ -11,7 +11,7 @@ use crate::tui::{
event::{Event, EventError, EventReceiver},
};
use super::app::{IAppBase, IAppEventFetch, IAppInput};
use super::app::{AppMode, IAppBase, IAppEventFetch, IAppInput};
#[cfg_attr(test, automock)]
pub trait IEventHandler<APP: IApp> {
@ -64,7 +64,9 @@ impl<APP: IApp> IEventHandlerPrivate<APP> for EventHandler {
};
}
match app.state() {
match app.mode() {
AppMode::Input(input_mode) => Self::handle_input_key_event(input_mode, key_event),
AppMode::Browse(browse_mode) => match browse_mode {
AppState::Browse(browse_state) => {
Self::handle_browse_key_event(browse_state, key_event)
}
@ -75,18 +77,19 @@ impl<APP: IApp> IEventHandlerPrivate<APP> for EventHandler {
AppState::Search(search_state) => {
Self::handle_search_key_event(search_state, key_event)
}
AppState::Fetch(fetch_state) => Self::handle_fetch_key_event(fetch_state, key_event),
AppState::Fetch(fetch_state) => {
Self::handle_fetch_key_event(fetch_state, key_event)
}
AppState::Match(match_state) => {
if match_state.taking_input() {
Self::handle_input_key_event(match_state, key_event)
} else {
Self::handle_match_key_event(match_state, key_event)
}
AppState::Error(error_state) => {
Self::handle_error_key_event(error_state, key_event)
}
AppState::Error(error_state) => Self::handle_error_key_event(error_state, key_event),
AppState::Critical(critical_state) => {
Self::handle_critical_key_event(critical_state, key_event)
}
},
}
}
@ -187,7 +190,7 @@ impl<APP: IApp> IEventHandlerPrivate<APP> for EventHandler {
return match key_event.code {
KeyCode::Char('g') | KeyCode::Char('G') => app.abort(),
_ => app.no_op(),
}
};
}
match key_event.code {
@ -203,7 +206,7 @@ impl<APP: IApp> IEventHandlerPrivate<APP> for EventHandler {
return match key_event.code {
KeyCode::Char('g') | KeyCode::Char('G') => app.abort(),
_ => app.no_op(),
}
};
}
match key_event.code {

9
src/tui/ui/mod.rs
View File

@ -195,7 +195,7 @@ impl IUi for Ui {
_ => {}
}
if let Some(input) = app.input {
if let Some(input) = app.inner.input {
Self::render_input_overlay(input, frame);
}
}
@ -224,6 +224,7 @@ mod tests {
inner: AppPublicInner {
collection: self.inner.collection,
selection: self.inner.selection,
input: self.inner.input,
},
state: match self.state {
AppState::Browse(()) => AppState::Browse(()),
@ -238,7 +239,6 @@ mod tests {
AppState::Error(s) => AppState::Error(s),
AppState::Critical(s) => AppState::Critical(s),
},
input: self.input,
}
}
}
@ -250,6 +250,7 @@ mod tests {
AppPublicInner {
collection,
selection,
input: None,
}
}
@ -271,7 +272,6 @@ mod tests {
let mut app = AppPublic {
inner: public_inner(collection, selection),
state: AppState::Browse(()),
input: None,
};
terminal.draw(|frame| Ui::render(&mut app, frame)).unwrap();
@ -350,7 +350,6 @@ mod tests {
info: None,
state: &mut widget_state,
}),
input: None,
};
terminal.draw(|frame| Ui::render(&mut app, frame)).unwrap();
}
@ -380,7 +379,6 @@ mod tests {
info: Some(&artist_matches),
state: &mut widget_state,
}),
input: None,
};
terminal.draw(|frame| Ui::render(&mut app, frame)).unwrap();
}
@ -415,7 +413,6 @@ mod tests {
info: Some(&album_matches),
state: &mut widget_state,
}),
input: None,
};
terminal.draw(|frame| Ui::render(&mut app, frame)).unwrap();
}