TUI refactoring

Author: mlund

src/textui/mod.rs

@@ -17,7 +17,6 @@ mod ui;
 
 use crate::{filehost, serial};
 use anyhow::Result;
-use crossterm::event::KeyCode;
 use serialport::SerialPort;
 use ui::{StatefulList, StatefulTable};
 
@@ -95,69 +94,34 @@ impl App {
         Ok(())
     }
 
-    // @todo this should be moved to ui.rs so that mod.rs is independent of crossterm
-    pub fn keypress(&mut self, key: crossterm::event::KeyCode) -> Result<()> {
-        match key {
-            KeyCode::Enter => {
-                match self.active_widget {
-                    AppWidgets::FileSelector => self.select_filehost_item()?,
-                    AppWidgets::FileAction => self.select_file_action()?,
-                    AppWidgets::CBMBrowser => self.select_cbm_item()?,
-                    _ => {}
-                }
-            }
+    /// Go to previous item in current widget (typically when pressing arrow up)
+    pub fn previous_item(&mut self) {
+        match self.active_widget {
+            AppWidgets::CBMBrowser => self.cbm_browser.previous(),
+            AppWidgets::FileAction => self.file_action.previous(),
+            AppWidgets::FileSelector => self.filetable.previous(),
             _ => {}
         }
+    }
+
+    /// Go to next item in current widget (typically when pressing arrow down)
+    pub fn next_item(&mut self) {
         match self.active_widget {
-            AppWidgets::CBMBrowser => match key {
-                KeyCode::Down => {
-                    self.cbm_browser.next();
-                    Ok(())
-                }
-                KeyCode::Up => {
-                    self.cbm_browser.previous();
-                    Ok(())
-                }
-                _ => Ok(()),
-            },
-            AppWidgets::FileAction => match key {
-                KeyCode::Down => {
-                    self.file_action.next();
-                    Ok(())
-                }
-                KeyCode::Up => {
-                    self.file_action.previous();
-                    Ok(())
-                }
-                _ => Ok(()),
-            },
-            AppWidgets::FileSelector => match key {
-                KeyCode::Down => {
-                    self.filetable.next();
-                    Ok(())
-                }
-                KeyCode::Up => {
-                    self.filetable.previous();
-                    Ok(())
-                }
-                KeyCode::Char('s') => {
-                    self.sort_filehost();
-                    Ok(())
-                }
-                _ => Ok(()),
-            },
-            _ => Ok(()),
+            AppWidgets::CBMBrowser => self.cbm_browser.next(),
+            AppWidgets::FileAction => self.file_action.next(),
+            AppWidgets::FileSelector => self.filetable.next(),
+            _ => {}
         }
     }
 
-    fn escape_to_filehost_browser(&mut self) {
+    fn return_to_filehost(&mut self) {
         self.set_current_widget(AppWidgets::FileSelector);
         self.file_action.unselect();
     }
 
     /// Select currently highlighted file in FileHost browser
     fn select_filehost_item(&mut self) -> Result<(), anyhow::Error> {
-        // when selecting file, go to file action widget 
+        // when selecting file, go to file action widget
         self.active_widget = AppWidgets::FileAction;
         if !self.file_action.is_selected() {
             self.file_action.state.select(Some(0));
@@ -259,4 +223,11 @@ impl App {
         }
         Ok(())
     }
+
+    /// Send reset signal to MEGA65
+    pub fn reset(&mut self) -> Result<()> {
+        crate::serial::reset(&mut self.port)?;
+        self.add_message("Reset MEGA65");
+        Ok(())
+    }
 }

src/textui/terminal.rs

@@ -67,11 +67,11 @@ fn run_app<B: Backend>(terminal: &mut Terminal<B>, mut app: App) -> Result<()> {
             match key.code {
                 KeyCode::Char('q') => return Ok(()),
                 KeyCode::Char('h') => app.toggle_help(),
-                KeyCode::Esc => app.escape_to_filehost_browser(),
-                KeyCode::Char('R') => {
-                    crate::serial::reset(&mut app.port)?;
-                    app.add_message("Reset MEGA65");
-                }
+                KeyCode::Char('s') => app.sort_filehost(),
+                KeyCode::Esc => app.return_to_filehost(),
+                KeyCode::Up => app.previous_item(),
+                KeyCode::Down => app.next_item(),
+                // We check for ENTER twice in order to allow update display to/from BUSY state
                 KeyCode::Enter => {
                     if app.cbm_browser.is_selected() {
                         app.busy = true;
@@ -82,15 +82,24 @@ fn run_app<B: Backend>(terminal: &mut Terminal<B>, mut app: App) -> Result<()> {
                 }
                 _ => {}
             }
-            match app.keypress(key.code) {
+            let result = match key.code {
+                KeyCode::Char('R') => app.reset(),
+                KeyCode::Enter => match app.active_widget {
+                    AppWidgets::FileSelector => app.select_filehost_item(),
+                    AppWidgets::FileAction => app.select_file_action(),
+                    AppWidgets::CBMBrowser => app.select_cbm_item(),
+                    _ => Ok(()),
+                },
+                _ => Ok(()),
+            };
+            match result {
                 Ok(()) => {}
                 Err(error) => {
                     app.add_message(error.to_string().as_str());
                     app.cbm_browser.unselect();
                     app.active_widget = AppWidgets::FileSelector;
                 }
             }
-            //app.ok_message();
         }
     }
 }