convert input handling to crosstermion

3 files changed, 35 insertions, 23 deletions

diff --git a/src/interactive/app_test/journeys_readonly.rs b/src/interactive/app_test/journeys_readonly.rs
index 595491a..f5337ca 100644
--- a/src/interactive/app_test/journeys_readonly.rs
+++ b/src/interactive/app_test/journeys_readonly.rs
@@ -1,7 +1,7 @@
 use crate::interactive::{
     app_test::utils::{
-        fixture_str, index_by_name, initialized_app_and_terminal_from_fixture, node_by_index,
-        node_by_name,
+        adapt, fixture_str, index_by_name, initialized_app_and_terminal_from_fixture,
+        node_by_index, node_by_name,
     },
     app_test::FIXTURE_PATH,
     SortMode,
@@ -54,7 +54,7 @@ fn simple_user_journey_read_only() -> Result<()> {
     // SORTING
     {
         // when hitting the S key
-        app.process_events(&mut terminal, b"s".keys())?;
+        app.process_events(&mut terminal, adapt(b"s".keys()))?;
         assert_eq!(
             app.state.sorting,
             SortMode::SizeAscending,
@@ -66,7 +66,7 @@ fn simple_user_journey_read_only() -> Result<()> {
             "it recomputes the cached entries"
         );
         // when hitting the S key again
-        app.process_events(&mut terminal, b"s".keys())?;
+        app.process_events(&mut terminal, adapt(b"s".keys()))?;
         assert_eq!(
             app.state.sorting,
             SortMode::SizeDescending,
@@ -82,35 +82,35 @@ fn simple_user_journey_read_only() -> Result<()> {
     // Entry-Navigation
     {
         // when hitting the j key
-        app.process_events(&mut terminal, b"j".keys())?;
+        app.process_events(&mut terminal, adapt(b"j".keys()))?;
         assert_eq!(
             node_by_name(&app, fixture_str(long_root)),
             node_by_index(&app, *app.state.selected.as_ref().unwrap()),
             "it moves the cursor down and selects the next entry based on the current sort mode"
         );
         // when hitting it while there is nowhere to go
-        app.process_events(&mut terminal, b"j".keys())?;
+        app.process_events(&mut terminal, adapt(b"j".keys()))?;
         assert_eq!(
             node_by_name(&app, fixture_str(long_root)),
             node_by_index(&app, *app.state.selected.as_ref().unwrap()),
             "it stays at the previous position"
         );
         // when hitting the k key
-        app.process_events(&mut terminal, b"k".keys())?;
+        app.process_events(&mut terminal, adapt(b"k".keys()))?;
         assert_eq!(
             node_by_name(&app, fixture_str(short_root)),
             node_by_index(&app, *app.state.selected.as_ref().unwrap()),
             "it moves the cursor up and selects the next entry based on the current sort mode"
         );
         // when hitting the k key again
-        app.process_events(&mut terminal, b"k".keys())?;
+        app.process_events(&mut terminal, adapt(b"k".keys()))?;
         assert_eq!(
             node_by_name(&app, fixture_str(short_root)),
             node_by_index(&app, *app.state.selected.as_ref().unwrap()),
             "it stays at the current cursor position as there is nowhere to go"
         );
         // when hitting the o key with a directory selected
-        app.process_events(&mut terminal, b"o".keys())?;
+        app.process_events(&mut terminal, adapt(b"o".keys()))?;
         {
             let new_root_idx = index_by_name(&app, fixture_str(short_root));
             assert_eq!(
@@ -124,7 +124,7 @@ fn simple_user_journey_read_only() -> Result<()> {
             );
 
             // when hitting the u key while inside a sub-directory
-            app.process_events(&mut terminal, b"u".keys())?;
+            app.process_events(&mut terminal, adapt(b"u".keys()))?;
             {
                 assert_eq!(
                     app.traversal.root_index, app.state.root,
@@ -139,7 +139,7 @@ fn simple_user_journey_read_only() -> Result<()> {
         }
         // when hitting the u key while inside of the root directory
         // We are moving the cursor down just to have a non-default selection
-        app.process_events(&mut terminal, b"ju".keys())?;
+        app.process_events(&mut terminal, adapt(b"ju".keys()))?;
         {
             assert_eq!(
                 app.traversal.root_index, app.state.root,
@@ -156,9 +156,9 @@ fn simple_user_journey_read_only() -> Result<()> {
     // Deletion
     {
         // when hitting the 'd' key (also move cursor back to start)
-        app.process_events(&mut terminal, b"k".keys())?;
+        app.process_events(&mut terminal, adapt(b"k".keys()))?;
         let previously_selected_index = *app.state.selected.as_ref().unwrap();
-        app.process_events(&mut terminal, b"d".keys())?;
+        app.process_events(&mut terminal, adapt(b"d".keys()))?;
         {
             assert_eq!(
                 Some(1),
@@ -180,7 +180,7 @@ fn simple_user_journey_read_only() -> Result<()> {
 
         // when hitting the 'd' key again
         {
-            app.process_events(&mut terminal, b"d".keys())?;
+            app.process_events(&mut terminal, adapt(b"d".keys()))?;
 
             assert_eq!(
                 Some(2),
@@ -197,7 +197,7 @@ fn simple_user_journey_read_only() -> Result<()> {
 
         // when hitting the 'd' key once again
         {
-            app.process_events(&mut terminal, b"d".keys())?;
+            app.process_events(&mut terminal, adapt(b"d".keys()))?;
 
             assert_eq!(
                 Some(1),
@@ -214,7 +214,7 @@ fn simple_user_journey_read_only() -> Result<()> {
         }
         // when hitting the spacebar (after moving up to the first entry)
         {
-            app.process_events(&mut terminal, b"k ".keys())?;
+            app.process_events(&mut terminal, adapt(b"k ".keys()))?;
 
             assert_eq!(
                 None,
@@ -233,7 +233,7 @@ fn simple_user_journey_read_only() -> Result<()> {
     // Marking
     {
         // select something
-        app.process_events(&mut terminal, b" j ".keys())?;
+        app.process_events(&mut terminal, adapt(b" j ".keys()))?;
         assert_eq!(
             Some(false),
             app.window.mark_pane.as_ref().map(|p| p.has_focus()),
@@ -247,7 +247,7 @@ fn simple_user_journey_read_only() -> Result<()> {
         );
 
         // when advancing the selection to the marker pane
-        app.process_events(&mut terminal, b"\t".keys())?;
+        app.process_events(&mut terminal, adapt(b"\t".keys()))?;
         {
             assert_eq!(
                 Some(true),
diff --git a/src/interactive/app_test/journeys_with_writes.rs b/src/interactive/app_test/journeys_with_writes.rs
index 061fb4b..4efb331 100644
--- a/src/interactive/app_test/journeys_with_writes.rs
+++ b/src/interactive/app_test/journeys_with_writes.rs
@@ -1,10 +1,10 @@
 use crate::interactive::app_test::utils::{
-    initialized_app_and_terminal_from_paths, WritableFixture,
+    adapt, initialized_app_and_terminal_from_paths, WritableFixture,
 };
 use anyhow::Result;
 use pretty_assertions::assert_eq;
-use termion::event::Key;
-use termion::input::TermRead;
+use std::convert::TryInto;
+use termion::{event::Key, input::TermRead};
 
 #[test]
 fn basic_user_journey_with_deletion() -> Result<()> {
@@ -12,7 +12,7 @@ fn basic_user_journey_with_deletion() -> Result<()> {
     let (mut terminal, mut app) = initialized_app_and_terminal_from_paths(&[fixture.root.clone()])?;
 
     // With a selection of items
-    app.process_events(&mut terminal, b"doddd".keys())?;
+    app.process_events(&mut terminal, adapt(b"doddd".keys()))?;
 
     assert_eq!(
         app.window.mark_pane.as_ref().map(|p| p.marked().len()),
@@ -29,7 +29,11 @@ fn basic_user_journey_with_deletion() -> Result<()> {
     // When selecting the marker window and pressing the combination to delete entries
     app.process_events(
         &mut terminal,
-        vec![Ok(Key::Char('\t')), Ok(Key::Ctrl('r'))].into_iter(),
+        vec![
+            Key::Char('\t').try_into().unwrap(),
+            Key::Ctrl('r').try_into().unwrap(),
+        ]
+        .into_iter(),
     )?;
     assert_eq!(
         app.window.mark_pane.is_none(),
diff --git a/src/interactive/app_test/utils.rs b/src/interactive/app_test/utils.rs
index 495ac01..c0f1c33 100644
--- a/src/interactive/app_test/utils.rs
+++ b/src/interactive/app_test/utils.rs
@@ -18,6 +18,14 @@ use std::{
 use tui::backend::TestBackend;
 use tui_react::Terminal;
 
+pub fn adapt(
+    keys: impl Iterator<Item = std::io::Result<termion::event::Key>>,
+) -> impl Iterator<Item = crosstermion::input::Key> {
+    use std::convert::TryFrom;
+    keys.filter_map(Result::ok)
+        .filter_map(|k| crosstermion::input::Key::try_from(k).ok())
+}
+
 pub fn node_by_index(app: &TerminalApp, id: TreeIndex) -> &EntryData {
     app.traversal.tree.node_weight(id).unwrap()
 }