From 7740a2ad558eb289e9d8c0b33fe43453942398e0 Mon Sep 17 00:00:00 2001 From: Akshay Date: Sat, 18 Jul 2020 14:35:59 +0530 Subject: refactor app.rs into module: app --- src/app/impl_self.rs | 247 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/impl_view.rs | 175 ++++++++++++++++++++++++++++++++++++ src/app/mod.rs | 27 ++++++ 3 files changed, 449 insertions(+) create mode 100644 src/app/impl_self.rs create mode 100644 src/app/impl_view.rs create mode 100644 src/app/mod.rs (limited to 'src/app') diff --git a/src/app/impl_self.rs b/src/app/impl_self.rs new file mode 100644 index 0000000..efed4e0 --- /dev/null +++ b/src/app/impl_self.rs @@ -0,0 +1,247 @@ +use std::default::Default; +use std::f64; +use std::fs::{File, OpenOptions}; +use std::io::prelude::*; +use std::path::PathBuf; +use std::sync::mpsc::channel; +use std::time::Duration; + +use chrono::Local; +use cursive::direction::Absolute; +use cursive::Vec2; +use notify::{watcher, RecursiveMode, Watcher}; + +use crate::habit::{Bit, Count, HabitWrapper, TrackEvent, ViewMode}; +use crate::utils; +use crate::Command; +use crate::CONFIGURATION; + +use crate::app::{App, StatusLine}; + +impl App { + pub fn new() -> Self { + let (tx, rx) = channel(); + let mut watcher = watcher(tx, Duration::from_secs(1)).unwrap(); + watcher + .watch(utils::auto_habit_file(), RecursiveMode::Recursive) + .unwrap_or_else(|e| { + panic!("Unable to start file watcher: {}", e); + }); + return App { + habits: vec![], + focus: 0, + _file_watcher: watcher, + file_event_recv: rx, + view_month_offset: 0, + }; + } + + pub fn add_habit(&mut self, h: Box) { + self.habits.push(h); + } + + pub fn delete_by_name(&mut self, name: &str) { + self.habits.retain(|h| h.name() != name); + } + + pub fn get_mode(&self) -> ViewMode { + if self.habits.is_empty() { + return ViewMode::Day; + } + return self.habits[self.focus].view_mode(); + } + + pub fn set_mode(&mut self, mode: ViewMode) { + if !self.habits.is_empty() { + self.habits[self.focus].set_view_mode(mode); + } + } + + pub fn set_view_month_offset(&mut self, offset: u32) { + self.view_month_offset = offset; + for v in self.habits.iter_mut() { + v.set_view_month_offset(offset); + } + } + + pub fn sift_backward(&mut self) { + self.view_month_offset += 1; + for v in self.habits.iter_mut() { + v.set_view_month_offset(self.view_month_offset); + } + } + + pub fn sift_forward(&mut self) { + if self.view_month_offset > 0 { + self.view_month_offset -= 1; + for v in self.habits.iter_mut() { + v.set_view_month_offset(self.view_month_offset); + } + } + } + + pub fn set_focus(&mut self, d: Absolute) { + let grid_width = CONFIGURATION.grid_width; + match d { + Absolute::Right => { + if self.focus != self.habits.len() - 1 { + self.focus += 1; + } + } + Absolute::Left => { + if self.focus != 0 { + self.focus -= 1; + } + } + Absolute::Down => { + if self.focus + grid_width < self.habits.len() - 1 { + self.focus += grid_width; + } else { + self.focus = self.habits.len() - 1; + } + } + Absolute::Up => { + if self.focus as isize - grid_width as isize >= 0 { + self.focus -= grid_width; + } else { + self.focus = 0; + } + } + Absolute::None => {} + } + } + + pub fn status(&self) -> StatusLine { + let today = chrono::Local::now().naive_utc().date(); + let remaining = self.habits.iter().map(|h| h.remaining(today)).sum::(); + let total = self.habits.iter().map(|h| h.goal()).sum::(); + let completed = total - remaining; + + let timestamp = if self.view_month_offset == 0 { + format!("{}", Local::now().date().format("%d/%b/%y"),) + } else { + let months = self.view_month_offset; + format!("{}", format!("{} months ago", months),) + }; + + StatusLine { + 0: format!( + "Today: {} completed, {} remaining --{}--", + completed, + remaining, + self.get_mode() + ), + 1: timestamp, + } + } + + pub fn max_size(&self) -> Vec2 { + let grid_width = CONFIGURATION.grid_width; + let width = { + if self.habits.len() > 0 { + grid_width * CONFIGURATION.view_width + } else { + 0 + } + }; + let height = { + if self.habits.len() > 0 { + (CONFIGURATION.view_height as f64 + * (self.habits.len() as f64 / grid_width as f64).ceil()) + as usize + } else { + 0 + } + }; + Vec2::new(width, height + 2) + } + + pub fn load_state() -> Self { + let (regular_f, auto_f) = (utils::habit_file(), utils::auto_habit_file()); + let read_from_file = |file: PathBuf| -> Vec> { + if let Ok(ref mut f) = File::open(file) { + let mut j = String::new(); + f.read_to_string(&mut j); + return serde_json::from_str(&j).unwrap(); + } else { + return Vec::new(); + } + }; + + let mut regular = read_from_file(regular_f); + let auto = read_from_file(auto_f); + regular.extend(auto); + return App { + habits: regular, + ..Default::default() + }; + } + + // this function does IO + // TODO: convert this into non-blocking async function + pub fn save_state(&self) { + let (regular, auto): (Vec<_>, Vec<_>) = self.habits.iter().partition(|&x| !x.is_auto()); + let (regular_f, auto_f) = (utils::habit_file(), utils::auto_habit_file()); + + let write_to_file = |data: Vec<&Box>, file: PathBuf| { + let j = serde_json::to_string_pretty(&data).unwrap(); + match OpenOptions::new() + .write(true) + .create(true) + .truncate(true) + .open(file) + { + Ok(ref mut f) => f.write_all(j.as_bytes()).unwrap(), + Err(_) => panic!("Unable to write!"), + }; + }; + + write_to_file(regular, regular_f); + write_to_file(auto, auto_f); + } + + pub fn parse_command(&mut self, c: Command) { + match c { + Command::Add(name, goal, auto) => { + let kind = if goal == Some(1) { "bit" } else { "count" }; + if kind == "count" { + self.add_habit(Box::new(Count::new( + name, + goal.unwrap_or(0), + auto.unwrap_or(false), + ))); + } else if kind == "bit" { + self.add_habit(Box::new(Bit::new(name, auto.unwrap_or(false)))); + } + } + Command::Delete(name) => { + self.delete_by_name(&name); + self.focus = 0; + } + Command::TrackUp(name) => { + let target_habit = self + .habits + .iter_mut() + .find(|x| x.name() == name && x.is_auto()); + if let Some(h) = target_habit { + h.modify(Local::now().naive_utc().date(), TrackEvent::Increment); + } + } + Command::TrackDown(name) => { + let target_habit = self + .habits + .iter_mut() + .find(|x| x.name() == name && x.is_auto()); + if let Some(h) = target_habit { + h.modify(Local::now().naive_utc().date(), TrackEvent::Decrement); + } + } + Command::Quit => self.save_state(), + Command::MonthNext => self.sift_forward(), + Command::MonthPrev => self.sift_backward(), + _ => { + eprintln!("UNKNOWN COMMAND!"); + } + } + } +} diff --git a/src/app/impl_view.rs b/src/app/impl_view.rs new file mode 100644 index 0000000..904403b --- /dev/null +++ b/src/app/impl_view.rs @@ -0,0 +1,175 @@ +use std::f64; +use std::fs::File; +use std::io::prelude::*; +use std::path::PathBuf; + +use cursive::direction::{Absolute, Direction}; +use cursive::event::{Event, EventResult, Key}; +use cursive::view::View; +use cursive::{Printer, Vec2}; +use notify::DebouncedEvent; + +use crate::app::App; +use crate::habit::{HabitWrapper, ViewMode}; +use crate::utils; +use crate::CONFIGURATION; + +impl View for App { + fn draw(&self, printer: &Printer) { + let grid_width = CONFIGURATION.grid_width; + let view_width = CONFIGURATION.view_width; + let view_height = CONFIGURATION.view_height; + let mut offset = Vec2::zero(); + for (idx, habit) in self.habits.iter().enumerate() { + if idx >= grid_width && idx % grid_width == 0 { + offset = offset.map_y(|y| y + view_height).map_x(|_| 0); + } + habit.draw(&printer.offset(offset).focused(self.focus == idx)); + offset = offset.map_x(|x| x + view_width + 2); + } + + offset = offset.map_x(|_| 0).map_y(|_| self.max_size().y - 2); + + let status = self.status(); + printer.print(offset, &status.0); // left status + + let full = self.max_size().x; + offset = offset.map_x(|_| full - status.1.len()); + printer.print(offset, &status.1); // right status + } + + fn required_size(&mut self, _: Vec2) -> Vec2 { + let grid_width = CONFIGURATION.grid_width; + let view_width = CONFIGURATION.view_width; + let view_height = CONFIGURATION.view_height; + let width = { + if self.habits.len() > 0 { + grid_width * (view_width + 2) + } else { + 0 + } + }; + let height = { + if self.habits.len() > 0 { + (view_height as f64 * (self.habits.len() as f64 / grid_width as f64).ceil()) + as usize + + 2 // to acoomodate statusline and message line + } else { + 0 + } + }; + Vec2::new(width, height) + } + + fn take_focus(&mut self, _: Direction) -> bool { + false + } + + fn on_event(&mut self, e: Event) -> EventResult { + match self.file_event_recv.try_recv() { + Ok(DebouncedEvent::Write(_)) => { + let read_from_file = |file: PathBuf| -> Vec> { + if let Ok(ref mut f) = File::open(file) { + let mut j = String::new(); + f.read_to_string(&mut j); + return serde_json::from_str(&j).unwrap(); + } else { + return Vec::new(); + } + }; + let auto = read_from_file(utils::auto_habit_file()); + self.habits.retain(|x| !x.is_auto()); + self.habits.extend(auto); + } + _ => {} + }; + match e { + Event::Key(Key::Right) | Event::Key(Key::Tab) | Event::Char('l') => { + self.set_focus(Absolute::Right); + return EventResult::Consumed(None); + } + Event::Key(Key::Left) | Event::Shift(Key::Tab) | Event::Char('h') => { + self.set_focus(Absolute::Left); + return EventResult::Consumed(None); + } + Event::Key(Key::Up) | Event::Char('k') => { + self.set_focus(Absolute::Up); + return EventResult::Consumed(None); + } + Event::Key(Key::Down) | Event::Char('j') => { + self.set_focus(Absolute::Down); + return EventResult::Consumed(None); + } + Event::Char('d') => { + if self.habits.is_empty() { + return EventResult::Consumed(None); + } + self.habits.remove(self.focus); + self.focus = self.focus.checked_sub(1).unwrap_or(0); + return EventResult::Consumed(None); + } + Event::Char('w') => { + // helper bind to test write to file + let j = serde_json::to_string_pretty(&self.habits).unwrap(); + let mut file = File::create("foo.txt").unwrap(); + file.write_all(j.as_bytes()).unwrap(); + return EventResult::Consumed(None); + } + Event::Char('q') => { + self.save_state(); + return EventResult::with_cb(|s| s.quit()); + } + Event::Char('v') => { + if self.habits.is_empty() { + return EventResult::Consumed(None); + } + if self.habits[self.focus].view_mode() == ViewMode::Week { + self.set_mode(ViewMode::Day) + } else { + self.set_mode(ViewMode::Week) + } + return EventResult::Consumed(None); + } + Event::Char('V') => { + for habit in self.habits.iter_mut() { + habit.set_view_mode(ViewMode::Week); + } + return EventResult::Consumed(None); + } + Event::Key(Key::Esc) => { + for habit in self.habits.iter_mut() { + habit.set_view_mode(ViewMode::Day); + } + return EventResult::Consumed(None); + } + + /* We want sifting to be an app level function, + * that later trickles down into each habit + * */ + Event::Char(']') => { + self.sift_forward(); + return EventResult::Consumed(None); + } + Event::Char('[') => { + self.sift_backward(); + return EventResult::Consumed(None); + } + Event::Char('}') => { + self.set_view_month_offset(0); + return EventResult::Consumed(None); + } + + /* Every keybind that is not caught by App trickles + * down to the focused habit. We sift back to today + * before performing any action, "refocusing" the cursor + * */ + _ => { + if self.habits.is_empty() { + return EventResult::Ignored; + } + self.set_view_month_offset(0); + self.habits[self.focus].on_event(e) + } + } + } +} diff --git a/src/app/mod.rs b/src/app/mod.rs new file mode 100644 index 0000000..f00c936 --- /dev/null +++ b/src/app/mod.rs @@ -0,0 +1,27 @@ +use std::default::Default; +use std::sync::mpsc::Receiver; + +use notify::{DebouncedEvent, INotifyWatcher}; + +use crate::habit::HabitWrapper; + +mod impl_self; +mod impl_view; + +pub struct StatusLine(String, String); + +pub struct App { + // holds app data + habits: Vec>, + + _file_watcher: INotifyWatcher, + file_event_recv: Receiver, + focus: usize, + view_month_offset: u32, +} + +impl Default for App { + fn default() -> Self { + App::new() + } +} -- cgit v1.2.3