kdheepak/taskwarrior-tui
1
0
Fork 0
mirror of https://github.com/kdheepak/taskwarrior-tui.git synced 2025-08-25 17:57:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: Make quittable app ✨

Browse source
This commit is contained in:
Dheepak Krishnamurthy 2023-09-05 20:30:52 -04:00
parent a0ecdd4219
commit e09f460e64
2 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.envrc
View file

@ -3,3 +3,5 @@ export TASKDATA=`pwd`/tests/data/.task
export TASKWARRIOR_TUI_CONFIG=`pwd`/tests/data/.config export TASKWARRIOR_TUI_CONFIG=`pwd`/tests/data/.config
export TASKWARRIOR_TUI_DATA=`pwd`/tests/data/.data export TASKWARRIOR_TUI_DATA=`pwd`/tests/data/.data
export TASKWARRIOR_TUI_LOG_LEVEL=debug export TASKWARRIOR_TUI_LOG_LEVEL=debug
export RUST_LOG=debug
export RUST_BACKTRACE=full

32
src/app.rs
View file

@ -57,6 +57,7 @@ use crate::{
scrollbar::Scrollbar, scrollbar::Scrollbar,
table::{Row, Table, TableMode, TableState}, table::{Row, Table, TableMode, TableState},
task_report::TaskReportTable, task_report::TaskReportTable,
trace_dbg,
tui::{self, Event}, tui::{self, Event},
ui, ui,
utils::{self, get_data_dir}, utils::{self, get_data_dir},
@ -331,7 +332,7 @@ impl TaskwarriorTui {
tui.enter()?; tui.enter()?;
let mut events: Vec<KeyEvent> = Vec::new(); let mut events: Vec<KeyEvent> = Vec::new();
let mut ticker = 0; // let mut ticker = 0;
loop { loop {
if self.requires_redraw { if self.requires_redraw {
@ -341,17 +342,13 @@ impl TaskwarriorTui {
} }
tui.draw(|f| self.draw(f))?; tui.draw(|f| self.draw(f))?;
if let Some(event) = tui.next().await { if let Some(event) = tui.next().await {
trace_dbg!(event);
let mut maybe_action = match event { let mut maybe_action = match event {
Event::Quit => Some(Action::Quit), Event::Quit => Some(Action::Quit),
Event::Error => Some(Action::Error("Received event error".into())), Event::Error => Some(Action::Error("Received event error".into())),
Event::Closed => Some(Action::Quit), Event::Closed => Some(Action::Quit),
Event::Tick => { Event::Tick => {
if ticker > 5 { events.clear();
events.clear();
ticker = 0;
} else {
ticker += 1;
}
Some(Action::Tick) Some(Action::Tick)
} }
Event::Key(key_event) => { Event::Key(key_event) => {
@ -374,11 +371,11 @@ impl TaskwarriorTui {
Ok(()) Ok(())
} }
pub fn handle_event(&mut self, events: &Vec<KeyEvent>) -> Result<Option<Action>> {
Ok(None)
}
pub fn update(&mut self, action: Action) -> Result<Option<Action>> { pub fn update(&mut self, action: Action) -> Result<Option<Action>> {
match action {
Action::Quit => self.should_quit = true,
_ => {}
}
Ok(None) Ok(None)
} }
@ -2396,7 +2393,7 @@ impl TaskwarriorTui {
es es
} }
pub fn handle_input(&mut self, input: Vec<KeyEvent>) -> Result<()> { pub fn handle_event(&mut self, input: &Vec<KeyEvent>) -> Result<Option<Action>> {
match self.mode { match self.mode {
Mode::Projects => { Mode::Projects => {
ProjectsState::handle_input(self, *input.first().unwrap())?; ProjectsState::handle_input(self, *input.first().unwrap())?;
@ -2446,18 +2443,21 @@ impl TaskwarriorTui {
// } // }
} }
_ => { _ => {
self.handle_input_by_task_mode(input)?; return self.handle_input_by_task_mode(input);
} }
} }
self.update_task_table_state(); self.update_task_table_state();
Ok(()) Ok(None)
} }
fn handle_input_by_task_mode(&mut self, input: Vec<KeyEvent>) -> Result<Option<Action>> { fn handle_input_by_task_mode(&mut self, input: &Vec<KeyEvent>) -> Result<Option<Action>> {
match self.mode { match self.mode {
Mode::TaskReport => { Mode::TaskReport => {
if let Some(keymap) = self.config.keymap.get("task-report") { if let Some(keymap) = self.config.keymap.get("task-report") {
if let Some(action) = keymap.get(&input) { log::info!("Received input: {:?}", &input);
log::info!("Action {:?}", keymap.get(input));
if let Some(action) = keymap.get(input) {
log::info!("Got action: {:?}", &action);
return Ok(Some(action.clone())); return Ok(Some(action.clone()));
} }
} }