src/tui/app/machine/input.rs

@@ -1,8 +1,6 @@
 use tui_input::backend::crossterm::EventHandler;
 
-use crate::tui::app::{machine::App, AppState, IAppInput, InputEvent, InputPublic};
+use crate::tui::app::{machine::App, AppMode, AppState, IAppInput, InputEvent, InputPublic};
-
-use super::AppInputMode;
 
 #[derive(Default)]
 pub struct Input(tui_input::Input);
@@ -13,6 +11,27 @@ impl<'app> From<&'app Input> for InputPublic<'app> {
     }
 }
 
+impl From<App> for AppMode<App, AppInputMode> {
+    fn from(mut app: App) -> Self {
+        if let Some(input) = app.input_mut().take() {
+            AppMode::Input(AppInputMode::new(input, app))
+        } else {
+            AppMode::State(app)
+        }
+    }
+}
+
+pub struct AppInputMode {
+    input: Input,
+    app: App,
+}
+
+impl AppInputMode {
+    pub fn new(input: Input, app: App) -> Self {
+        AppInputMode { input, app }
+    }
+}
+
 impl IAppInput for AppInputMode {
     type APP = App;
 

src/tui/app/machine/mod.rs

@@ -21,7 +21,7 @@ use critical_state::CriticalState;
 use error_state::ErrorState;
 use fetch_state::FetchState;
 use info_state::InfoState;
-use input::Input;
+use input::{AppInputMode, Input};
 use match_state::MatchState;
 use reload_state::ReloadState;
 use search_state::SearchState;
@@ -53,17 +53,6 @@ pub struct AppInner {
     events: EventSender,
 }
 
-pub struct AppInputMode {
-    input: Input,
-    app: App,
-}
-
-impl AppInputMode {
-    fn new(input: Input, app: App) -> Self {
-        AppInputMode { input, app }
-    }
-}
-
 impl App {
     pub fn new<MH: IMusicHoard + 'static, MB: IMusicBrainz + Send + 'static>(
         mut music_hoard: MH,
@@ -147,12 +136,8 @@ impl IApp for App {
         self
     }
 
-    fn mode(mut self) -> super::AppMode<IAppState!(), Self::InputMode> {
+    fn mode(self) -> AppMode<IAppState!(), Self::InputMode> {
-        if let Some(input) = self.input_mut().take() {
+        self.into()
-            AppMode::Input(AppInputMode::new(input, self.state()))
-        } else {
-            AppMode::State(self.state())
-        }
     }
 }