diff --git a/crates/wayfarer/src/tui.rs b/crates/wayfarer/src/tui.rs index 5ba79e1..5eef3b5 100644 --- a/crates/wayfarer/src/tui.rs +++ b/crates/wayfarer/src/tui.rs @@ -43,7 +43,6 @@ pub enum Message { #[cfg(feature = "watch")] ToggleFileWatch, - #[cfg(feature = "watch")] ReloadFile, } @@ -139,7 +138,6 @@ fn handle_message( } } - #[cfg(feature = "watch")] Message::ReloadFile => { state.reload_active_savefile()?; } diff --git a/crates/wayfarer/src/tui/events.rs b/crates/wayfarer/src/tui/events.rs index 4466699..99ac023 100644 --- a/crates/wayfarer/src/tui/events.rs +++ b/crates/wayfarer/src/tui/events.rs @@ -73,6 +73,10 @@ fn handle_keyboard_input( msg_tx.send(Message::SetMode(Mode::SelectFile))?; } + (Mode::Normal, KeyCode::Char('r')) => { + msg_tx.send(Message::ReloadFile)?; + } + #[cfg(feature = "watch")] (Mode::Normal, KeyCode::Char('w')) => { msg_tx.send(Message::ToggleFileWatch)?; diff --git a/crates/wayfarer/src/tui/state.rs b/crates/wayfarer/src/tui/state.rs index c7bda15..367d956 100644 --- a/crates/wayfarer/src/tui/state.rs +++ b/crates/wayfarer/src/tui/state.rs @@ -4,6 +4,7 @@ use std::os::unix::prelude::OsStrExt; use anyhow::Result; use jrny_save::Savefile; +use tracing::debug; use tui_input::Input; #[cfg(feature = "watch")] @@ -92,10 +93,7 @@ impl State { self.file_watcher = None; } - #[cfg(feature = "watch")] pub fn reload_active_savefile(&mut self) -> Result<()> { - use tracing::debug; - if let Some(cur_savefile) = &self.savefile { debug!("Reloading file"); let new_savefile = Savefile::from_path(&cur_savefile.path)?;