kageru/tracc
2
1
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

use macro for current focus

Browse Source
This commit is contained in:
kageru 2020-04-18 18:15:23 +02:00
parent b52311e840
commit 292aeb417f
Signed by: kageru
GPG Key ID: 8282A2BEA4ADA3D2
2 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/timesheet.rs
View File

@ -2,6 +2,7 @@ use super::tracc::ListView;
use itertools::Itertools;
use serde::{Deserialize, Serialize};
use serde_json::from_reader;
use std::default;
use std::fmt;
use std::fs::File;
use std::io::BufReader;
@ -42,6 +43,12 @@ impl fmt::Display for TimePoint {
}
}
impl default::Default for TimePoint {
fn default() -> Self {
TimePoint::new("")
}
}
fn read_times(path: &str) -> Option<Vec<TimePoint>> {
File::open(path)
.ok()

49
src/tracc.rs
View File

@ -45,6 +45,15 @@ impl Tracc {
}
pub fn run(&mut self) -> Result<(), io::Error> {
macro_rules! with_focused {
($action: expr $(, $arg: expr)*) => {
match self.focus {
Focus::Top => $action(&mut self.todos, $($arg,)*),
Focus::Bottom => $action(&mut self.times, $($arg,)*),
}
};
};
let mut inputs = io::stdin().keys();
loop {
self.refresh()?;
@ -53,39 +62,21 @@ impl Tracc {
match self.input_mode {
Mode::Normal => match input {
Key::Char('q') => break,
Key::Char('j') => match self.focus {
Focus::Top => self.todos.selection_down(),
Focus::Bottom => self.times.selection_down(),
},
Key::Char('k') => match self.focus {
Focus::Top => self.todos.selection_up(),
Focus::Bottom => self.times.selection_up(),
},
Key::Char('j') => with_focused!(ListView::selection_down),
Key::Char('k') => with_focused!(ListView::selection_up),
Key::Char('o') => {
match self.focus {
Focus::Top => self.todos.insert(Default::default(), None),
Focus::Bottom => self.times.insert(TimePoint::new(""), None),
}
with_focused!(ListView::insert, Default::default(), None);
self.set_mode(Mode::Insert)?;
}
Key::Char('a') | Key::Char('A') => self.set_mode(Mode::Insert)?,
Key::Char(' ') => match self.focus {
Focus::Top => self.todos.toggle_current(),
Focus::Bottom => self.times.toggle_current(),
},
Key::Char(' ') => with_focused!(ListView::toggle_current),
// dd
Key::Char('d') => {
if let Key::Char('d') = inputs.next().unwrap()? {
match self.focus {
Focus::Top => self.todos.remove_current(),
Focus::Bottom => self.times.remove_current(),
}
with_focused!(ListView::remove_current)
}
}
Key::Char('p') => match self.focus {
Focus::Top => self.todos.paste(),
Focus::Bottom => self.times.paste(),
},
Key::Char('p') => with_focused!(ListView::paste),
Key::Char('\t') => {
self.focus = match self.focus {
Focus::Top => Focus::Bottom,
@ -96,14 +87,8 @@ impl Tracc {
},
Mode::Insert => match input {
Key::Char('\n') | Key::Esc => self.set_mode(Mode::Normal)?,
Key::Backspace => match self.focus {
Focus::Top => self.todos.backspace(),
Focus::Bottom => self.times.backspace(),
},
Key::Char(x) => match self.focus {
Focus::Top => self.todos.append_to_current(x),
Focus::Bottom => self.times.append_to_current(x),
},
Key::Backspace => with_focused!(ListView::backspace),
Key::Char(x) => with_focused!(ListView::append_to_current, x),
_ => (),
},
};