aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/app/impl_self.rs60
-rw-r--r--src/app/impl_view.rs38
-rw-r--r--src/command.rs87
-rw-r--r--src/habit/bit.rs4
-rw-r--r--src/main.rs23
-rw-r--r--src/theme.rs20
-rw-r--r--src/utils.rs130
-rw-r--r--src/views.rs35
8 files changed, 289 insertions, 108 deletions
diff --git a/src/app/impl_self.rs b/src/app/impl_self.rs
index 744f906..5cd9616 100644
--- a/src/app/impl_self.rs
+++ b/src/app/impl_self.rs
@@ -13,8 +13,7 @@ use notify::{watcher, RecursiveMode, Watcher};
13 13
14use crate::command::{Command, CommandLineError}; 14use crate::command::{Command, CommandLineError};
15use crate::habit::{Bit, Count, HabitWrapper, TrackEvent, ViewMode}; 15use crate::habit::{Bit, Count, HabitWrapper, TrackEvent, ViewMode};
16use crate::utils; 16use crate::utils::{self, GRID_WIDTH, VIEW_HEIGHT, VIEW_WIDTH};
17use crate::CONFIGURATION;
18 17
19use crate::app::{App, MessageKind, StatusLine}; 18use crate::app::{App, MessageKind, StatusLine};
20 19
@@ -37,6 +36,10 @@ impl App {
37 self.habits.push(h); 36 self.habits.push(h);
38 } 37 }
39 38
39 pub fn list_habits(&self) -> Vec<String> {
40 self.habits.iter().map(|x| x.name()).collect::<Vec<_>>()
41 }
42
40 pub fn delete_by_name(&mut self, name: &str) { 43 pub fn delete_by_name(&mut self, name: &str) {
41 let old_len = self.habits.len(); 44 let old_len = self.habits.len();
42 self.habits.retain(|h| h.name() != name); 45 self.habits.retain(|h| h.name() != name);
@@ -83,7 +86,6 @@ impl App {
83 } 86 }
84 87
85 pub fn set_focus(&mut self, d: Absolute) { 88 pub fn set_focus(&mut self, d: Absolute) {
86 let grid_width = CONFIGURATION.grid_width;
87 match d { 89 match d {
88 Absolute::Right => { 90 Absolute::Right => {
89 if self.focus != self.habits.len() - 1 { 91 if self.focus != self.habits.len() - 1 {
@@ -96,15 +98,15 @@ impl App {
96 } 98 }
97 } 99 }
98 Absolute::Down => { 100 Absolute::Down => {
99 if self.focus + grid_width < self.habits.len() - 1 { 101 if self.focus + GRID_WIDTH < self.habits.len() - 1 {
100 self.focus += grid_width; 102 self.focus += GRID_WIDTH;
101 } else { 103 } else {
102 self.focus = self.habits.len() - 1; 104 self.focus = self.habits.len() - 1;
103 } 105 }
104 } 106 }
105 Absolute::Up => { 107 Absolute::Up => {
106 if self.focus as isize - grid_width as isize >= 0 { 108 if self.focus as isize - GRID_WIDTH as isize >= 0 {
107 self.focus -= grid_width; 109 self.focus -= GRID_WIDTH;
108 } else { 110 } else {
109 self.focus = 0; 111 self.focus = 0;
110 } 112 }
@@ -118,13 +120,13 @@ impl App {
118 } 120 }
119 121
120 pub fn status(&self) -> StatusLine { 122 pub fn status(&self) -> StatusLine {
121 let today = chrono::Local::now().naive_utc().date(); 123 let today = chrono::Local::now().naive_local().date();
122 let remaining = self.habits.iter().map(|h| h.remaining(today)).sum::<u32>(); 124 let remaining = self.habits.iter().map(|h| h.remaining(today)).sum::<u32>();
123 let total = self.habits.iter().map(|h| h.goal()).sum::<u32>(); 125 let total = self.habits.iter().map(|h| h.goal()).sum::<u32>();
124 let completed = total - remaining; 126 let completed = total - remaining;
125 127
126 let timestamp = if self.view_month_offset == 0 { 128 let timestamp = if self.view_month_offset == 0 {
127 format!("{}", Local::now().date().format("%d/%b/%y"),) 129 format!("{}", Local::now().naive_local().date().format("%d/%b/%y"),)
128 } else { 130 } else {
129 let months = self.view_month_offset; 131 let months = self.view_month_offset;
130 format!("{}", format!("{} months ago", months),) 132 format!("{}", format!("{} months ago", months),)
@@ -142,12 +144,10 @@ impl App {
142 } 144 }
143 145
144 pub fn max_size(&self) -> Vec2 { 146 pub fn max_size(&self) -> Vec2 {
145 let grid_width = CONFIGURATION.grid_width; 147 let width = GRID_WIDTH * VIEW_WIDTH;
146 let width = grid_width * CONFIGURATION.view_width;
147 let height = { 148 let height = {
148 if !self.habits.is_empty() { 149 if !self.habits.is_empty() {
149 (CONFIGURATION.view_height as f64 150 (VIEW_HEIGHT as f64 * (self.habits.len() as f64 / GRID_WIDTH as f64).ceil())
150 * (self.habits.len() as f64 / grid_width as f64).ceil())
151 as usize 151 as usize
152 } else { 152 } else {
153 0 153 0
@@ -207,12 +207,18 @@ impl App {
207 .iter_mut() 207 .iter_mut()
208 .find(|x| x.name() == name && x.is_auto()); 208 .find(|x| x.name() == name && x.is_auto());
209 if let Some(h) = target_habit { 209 if let Some(h) = target_habit {
210 h.modify(Local::now().naive_utc().date(), event); 210 h.modify(Local::now().naive_local().date(), event);
211 } 211 }
212 }; 212 };
213 match result { 213 match result {
214 Ok(c) => match c { 214 Ok(c) => match c {
215 Command::Add(name, goal, auto) => { 215 Command::Add(name, goal, auto) => {
216 if let Some(_) = self.habits.iter().find(|x| x.name() == name) {
217 self.message.set_kind(MessageKind::Error);
218 self.message
219 .set_message(format!("Habit `{}` already exist", &name));
220 return;
221 }
216 let kind = if goal == Some(1) { "bit" } else { "count" }; 222 let kind = if goal == Some(1) { "bit" } else { "count" };
217 if kind == "count" { 223 if kind == "count" {
218 self.add_habit(Box::new(Count::new(name, goal.unwrap_or(0), auto))); 224 self.add_habit(Box::new(Count::new(name, goal.unwrap_or(0), auto)));
@@ -230,7 +236,31 @@ impl App {
230 Command::TrackDown(name) => { 236 Command::TrackDown(name) => {
231 _track(&name, TrackEvent::Decrement); 237 _track(&name, TrackEvent::Decrement);
232 } 238 }
233 Command::Quit => self.save_state(), 239 Command::Help(input) => {
240 if let Some(topic) = input.as_ref().map(String::as_ref) {
241 self.message.set_message(
242 match topic {
243 "a" | "add" => "add <habit-name> [goal] (alias: a)",
244 "aa" | "add-auto" => "add-auto <habit-name> [goal] (alias: aa)",
245 "d" | "delete" => "delete <habit-name> (alias: d)",
246 "mprev" | "month-prev" => "month-prev (alias: mprev)",
247 "mnext" | "month-next" => "month-next (alias: mnext)",
248 "tup" | "track-up" => "track-up <auto-habit-name> (alias: tup)",
249 "tdown" | "track-down" => "track-down <auto-habit-name> (alias: tdown)",
250 "q" | "quit" => "quit dijo",
251 "w" | "write" => "write current state to disk (alias: w)",
252 "h"|"?" | "help" => "help [<command>|commands|keys] (aliases: h, ?)",
253 "cmds" | "commands" => "add, add-auto, delete, month-{prev,next}, track-{up,down}, help, quit",
254 "keys" => "TODO", // TODO (view?)
255 _ => "unknown command or help topic.",
256 }
257 )
258 } else {
259 // TODO (view?)
260 self.message.set_message("help <command>|commands|keys")
261 }
262 }
263 Command::Quit | Command::Write => self.save_state(),
234 Command::MonthNext => self.sift_forward(), 264 Command::MonthNext => self.sift_forward(),
235 Command::MonthPrev => self.sift_backward(), 265 Command::MonthPrev => self.sift_backward(),
236 Command::Blank => {} 266 Command::Blank => {}
diff --git a/src/app/impl_view.rs b/src/app/impl_view.rs
index 892b00c..395cac4 100644
--- a/src/app/impl_view.rs
+++ b/src/app/impl_view.rs
@@ -12,21 +12,17 @@ use notify::DebouncedEvent;
12 12
13use crate::app::{App, MessageKind}; 13use crate::app::{App, MessageKind};
14use crate::habit::{HabitWrapper, ViewMode}; 14use crate::habit::{HabitWrapper, ViewMode};
15use crate::utils; 15use crate::utils::{self, GRID_WIDTH, VIEW_HEIGHT, VIEW_WIDTH};
16use crate::CONFIGURATION;
17 16
18impl View for App { 17impl View for App {
19 fn draw(&self, printer: &Printer) { 18 fn draw(&self, printer: &Printer) {
20 let grid_width = CONFIGURATION.grid_width;
21 let view_width = CONFIGURATION.view_width;
22 let view_height = CONFIGURATION.view_height;
23 let mut offset = Vec2::zero(); 19 let mut offset = Vec2::zero();
24 for (idx, habit) in self.habits.iter().enumerate() { 20 for (idx, habit) in self.habits.iter().enumerate() {
25 if idx >= grid_width && idx % grid_width == 0 { 21 if idx >= GRID_WIDTH && idx % GRID_WIDTH == 0 {
26 offset = offset.map_y(|y| y + view_height).map_x(|_| 0); 22 offset = offset.map_y(|y| y + VIEW_HEIGHT).map_x(|_| 0);
27 } 23 }
28 habit.draw(&printer.offset(offset).focused(self.focus == idx)); 24 habit.draw(&printer.offset(offset).focused(self.focus == idx));
29 offset = offset.map_x(|x| x + view_width + 2); 25 offset = offset.map_x(|x| x + VIEW_WIDTH + 2);
30 } 26 }
31 27
32 offset = offset.map_x(|_| 0).map_y(|_| self.max_size().y - 2); 28 offset = offset.map_x(|_| 0).map_y(|_| self.max_size().y - 2);
@@ -45,13 +41,10 @@ impl View for App {
45 } 41 }
46 42
47 fn required_size(&mut self, _: Vec2) -> Vec2 { 43 fn required_size(&mut self, _: Vec2) -> Vec2 {
48 let grid_width = CONFIGURATION.grid_width; 44 let width = GRID_WIDTH * (VIEW_WIDTH + 2);
49 let view_width = CONFIGURATION.view_width;
50 let view_height = CONFIGURATION.view_height;
51 let width = grid_width * (view_width + 2);
52 let height = { 45 let height = {
53 if self.habits.len() > 0 { 46 if self.habits.len() > 0 {
54 (view_height as f64 * (self.habits.len() as f64 / grid_width as f64).ceil()) 47 (VIEW_HEIGHT as f64 * (self.habits.len() as f64 / GRID_WIDTH as f64).ceil())
55 as usize 48 as usize
56 } else { 49 } else {
57 0 50 0
@@ -102,25 +95,6 @@ impl View for App {
102 self.set_focus(Absolute::Down); 95 self.set_focus(Absolute::Down);
103 return EventResult::Consumed(None); 96 return EventResult::Consumed(None);
104 } 97 }
105 Event::Char('d') => {
106 if self.habits.is_empty() {
107 return EventResult::Consumed(None);
108 }
109 self.habits.remove(self.focus);
110 self.focus = self.focus.checked_sub(1).unwrap_or(0);
111 return EventResult::Consumed(None);
112 }
113 Event::Char('w') => {
114 // helper bind to test write to file
115 let j = serde_json::to_string_pretty(&self.habits).unwrap();
116 let mut file = File::create("foo.txt").unwrap();
117 file.write_all(j.as_bytes()).unwrap();
118 return EventResult::Consumed(None);
119 }
120 Event::Char('q') => {
121 self.save_state();
122 return EventResult::with_cb(|s| s.quit());
123 }
124 Event::Char('v') => { 98 Event::Char('v') => {
125 if self.habits.is_empty() { 99 if self.habits.is_empty() {
126 return EventResult::Consumed(None); 100 return EventResult::Consumed(None);
diff --git a/src/command.rs b/src/command.rs
index f856b00..4f3e491 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -1,21 +1,73 @@
1use std::fmt; 1use std::fmt;
2 2
3use cursive::event::{Event, EventResult, Key};
3use cursive::theme::{BaseColor, Color, ColorStyle}; 4use cursive::theme::{BaseColor, Color, ColorStyle};
4use cursive::view::Resizable; 5use cursive::view::Resizable;
5use cursive::views::{EditView, LinearLayout, TextView}; 6use cursive::views::{EditView, LinearLayout, OnEventView, TextView};
6use cursive::Cursive; 7use cursive::Cursive;
7 8
8use crate::{app::App, CONFIGURATION}; 9use crate::app::App;
10use crate::utils::{GRID_WIDTH, VIEW_WIDTH};
11
12static COMMANDS: &'static [&'static str] = &[
13 "add",
14 "add-auto",
15 "delete",
16 "track-up",
17 "track-down",
18 "month-prev",
19 "month-next",
20 "quit",
21 "write",
22 "help",
23];
24
25fn get_command_completion(prefix: &str) -> Option<String> {
26 let first_match = COMMANDS.iter().filter(|&x| x.starts_with(prefix)).next();
27 return first_match.map(|&x| x.into());
28}
29
30fn get_habit_completion(prefix: &str, habit_names: &[String]) -> Option<String> {
31 let first_match = habit_names.iter().filter(|&x| x.starts_with(prefix)).next();
32 return first_match.map(|x| x.into());
33}
9 34
10pub fn open_command_window(s: &mut Cursive) { 35pub fn open_command_window(s: &mut Cursive) {
11 let command_window = EditView::new() 36 let habit_list: Vec<String> = s
12 .filler(" ") 37 .call_on_name("Main", |view: &mut App| {
13 .on_submit(call_on_app) 38 return view.list_habits();
14 .style(ColorStyle::new( 39 })
15 Color::Dark(BaseColor::Black), 40 .unwrap();
16 Color::Dark(BaseColor::White), 41 let style = ColorStyle::new(Color::Dark(BaseColor::Black), Color::Dark(BaseColor::White));
17 )) 42 let command_window = OnEventView::new(
18 .fixed_width(CONFIGURATION.view_width * CONFIGURATION.grid_width); 43 EditView::new()
44 .filler(" ")
45 .on_submit(call_on_app)
46 .style(style),
47 )
48 .on_event_inner(
49 Event::Key(Key::Tab),
50 move |view: &mut EditView, _: &Event| {
51 let contents = view.get_content();
52 if !contents.contains(" ") {
53 let completion = get_command_completion(&*contents);
54 if let Some(c) = completion {
55 let cb = view.set_content(c);
56 return Some(EventResult::Consumed(Some(cb)));
57 };
58 return None;
59 } else {
60 let word = contents.split(' ').last().unwrap();
61 let completion = get_habit_completion(word, &habit_list);
62 if let Some(c) = completion {
63 let cb = view.set_content(format!("{}", contents) + &c[word.len()..]);
64 return Some(EventResult::Consumed(Some(cb)));
65 };
66 return None;
67 }
68 },
69 )
70 .fixed_width(VIEW_WIDTH * GRID_WIDTH);
19 s.call_on_name("Frame", |view: &mut LinearLayout| { 71 s.call_on_name("Frame", |view: &mut LinearLayout| {
20 let mut commandline = LinearLayout::horizontal() 72 let mut commandline = LinearLayout::horizontal()
21 .child(TextView::new(":")) 73 .child(TextView::new(":"))
@@ -59,15 +111,17 @@ pub enum Command {
59 Delete(String), 111 Delete(String),
60 TrackUp(String), 112 TrackUp(String),
61 TrackDown(String), 113 TrackDown(String),
114 Help(Option<String>),
115 Write,
62 Quit, 116 Quit,
63 Blank, 117 Blank,
64} 118}
65 119
66#[derive(Debug)] 120#[derive(Debug)]
67pub enum CommandLineError { 121pub enum CommandLineError {
68 InvalidCommand(String), 122 InvalidCommand(String), // command name
69 InvalidArg(u32), // position 123 InvalidArg(u32), // position
70 NotEnoughArgs(String, u32), 124 NotEnoughArgs(String, u32), // command name, required no. of args
71} 125}
72 126
73impl std::error::Error for CommandLineError {} 127impl std::error::Error for CommandLineError {}
@@ -134,9 +188,16 @@ impl Command {
134 } 188 }
135 return Ok(Command::TrackDown(args[0].to_string())); 189 return Ok(Command::TrackDown(args[0].to_string()));
136 } 190 }
191 "h" | "?" | "help" => {
192 if args.is_empty() {
193 return Ok(Command::Help(None));
194 }
195 return Ok(Command::Help(Some(args[0].to_string())));
196 }
137 "mprev" | "month-prev" => return Ok(Command::MonthPrev), 197 "mprev" | "month-prev" => return Ok(Command::MonthPrev),
138 "mnext" | "month-next" => return Ok(Command::MonthNext), 198 "mnext" | "month-next" => return Ok(Command::MonthNext),
139 "q" | "quit" => return Ok(Command::Quit), 199 "q" | "quit" => return Ok(Command::Quit),
200 "w" | "write" => return Ok(Command::Write),
140 "" => return Ok(Command::Blank), 201 "" => return Ok(Command::Blank),
141 s => return Err(CommandLineError::InvalidCommand(s.into())), 202 s => return Err(CommandLineError::InvalidCommand(s.into())),
142 } 203 }
diff --git a/src/habit/bit.rs b/src/habit/bit.rs
index 8fa14c2..2bbb0ac 100644
--- a/src/habit/bit.rs
+++ b/src/habit/bit.rs
@@ -18,9 +18,9 @@ impl fmt::Display for CustomBool {
18 f, 18 f,
19 "{:^3}", 19 "{:^3}",
20 if self.0 { 20 if self.0 {
21 CONFIGURATION.true_chr 21 CONFIGURATION.look.true_chr
22 } else { 22 } else {
23 CONFIGURATION.false_chr 23 CONFIGURATION.look.false_chr
24 } 24 }
25 ) 25 )
26 } 26 }
diff --git a/src/main.rs b/src/main.rs
index 14ddf03..5280b35 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,7 +12,13 @@ use crate::command::{open_command_window, Command};
12use crate::utils::{load_configuration_file, AppConfig}; 12use crate::utils::{load_configuration_file, AppConfig};
13 13
14use clap::{App as ClapApp, Arg}; 14use clap::{App as ClapApp, Arg};
15
16#[cfg(any(feature = "termion-backend", feature = "default"))]
15use cursive::termion; 17use cursive::termion;
18
19#[cfg(feature = "crossterm-backend")]
20use cursive::crossterm;
21
16use cursive::views::{LinearLayout, NamedView}; 22use cursive::views::{LinearLayout, NamedView};
17use lazy_static::lazy_static; 23use lazy_static::lazy_static;
18 24
@@ -33,6 +39,14 @@ fn main() {
33 .value_name("CMD") 39 .value_name("CMD")
34 .help("run a dijo command"), 40 .help("run a dijo command"),
35 ) 41 )
42 .arg(
43 Arg::with_name("list")
44 .short("l")
45 .long("list")
46 .takes_value(false)
47 .help("list dijo habits")
48 .conflicts_with("command"),
49 )
36 .get_matches(); 50 .get_matches();
37 if let Some(c) = matches.value_of("command") { 51 if let Some(c) = matches.value_of("command") {
38 let command = Command::from_string(c); 52 let command = Command::from_string(c);
@@ -49,8 +63,17 @@ fn main() {
49 "Commands other than `track-up` and `track-down` are currently not supported!" 63 "Commands other than `track-up` and `track-down` are currently not supported!"
50 ), 64 ),
51 } 65 }
66 } else if matches.is_present("list") {
67 for h in App::load_state().list_habits() {
68 println!("{}", h);
69 }
52 } else { 70 } else {
71 #[cfg(any(feature = "termion-backend", feature = "default"))]
53 let mut s = termion().unwrap(); 72 let mut s = termion().unwrap();
73
74 #[cfg(feature = "crossterm-backend")]
75 let mut s = crossterm().unwrap();
76
54 let app = App::load_state(); 77 let app = App::load_state();
55 let layout = NamedView::new( 78 let layout = NamedView::new(
56 "Frame", 79 "Frame",
diff --git a/src/theme.rs b/src/theme.rs
index 4194777..1d2cc36 100644
--- a/src/theme.rs
+++ b/src/theme.rs
@@ -1,18 +1,18 @@
1use cursive::theme::Color::*; 1use cursive::theme::Color::*;
2use cursive::theme::PaletteColor::*; 2use cursive::theme::PaletteColor::*;
3use cursive::theme::{BaseColor, BorderStyle, Palette, Theme}; 3use cursive::theme::{BorderStyle, Palette, Theme};
4 4
5pub fn pallete_gen() -> Palette { 5pub fn pallete_gen() -> Palette {
6 let mut p = Palette::default(); 6 let mut p = Palette::default();
7 p[Background] = Dark(BaseColor::Black); 7 p[Background] = TerminalDefault;
8 p[Shadow] = Light(BaseColor::Black); 8 p[Shadow] = TerminalDefault;
9 p[View] = Dark(BaseColor::Black); 9 p[View] = TerminalDefault;
10 p[Primary] = Dark(BaseColor::White); 10 p[Primary] = TerminalDefault;
11 p[Secondary] = Dark(BaseColor::Black); 11 p[Secondary] = TerminalDefault;
12 p[Tertiary] = Dark(BaseColor::Green); 12 p[Tertiary] = TerminalDefault;
13 p[TitlePrimary] = Light(BaseColor::White); 13 p[TitlePrimary] = TerminalDefault;
14 p[Highlight] = Dark(BaseColor::Red); 14 p[Highlight] = TerminalDefault;
15 p[HighlightInactive] = Dark(BaseColor::Black); 15 p[HighlightInactive] = TerminalDefault;
16 16
17 return p; 17 return p;
18} 18}
diff --git a/src/utils.rs b/src/utils.rs
index e6ec6ac..2453aa6 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -1,37 +1,117 @@
1use cursive::theme::{BaseColor, Color}; 1use cursive::theme::{BaseColor, Color};
2use directories::ProjectDirs; 2use directories::ProjectDirs;
3use std::fs; 3use serde::{Deserialize, Serialize};
4
5use std;
6use std::default::Default;
7use std::fs::{self, File, OpenOptions};
8use std::io::{Read, Write};
4use std::path::PathBuf; 9use std::path::PathBuf;
5 10
6pub struct AppConfig { 11pub const VIEW_WIDTH: usize = 25;
12pub const VIEW_HEIGHT: usize = 8;
13pub const GRID_WIDTH: usize = 3;
14
15#[derive(Serialize, Deserialize)]
16pub struct Characters {
17 #[serde(default = "base_char")]
7 pub true_chr: char, 18 pub true_chr: char,
19 #[serde(default = "base_char")]
8 pub false_chr: char, 20 pub false_chr: char,
21 #[serde(default = "base_char")]
9 pub future_chr: char, 22 pub future_chr: char,
23}
10 24
11 // view dimensions 25fn base_char() -> char {
12 pub view_width: usize, 26 '·'
13 pub view_height: usize, 27}
14 28
15 // app dimensions 29impl Default for Characters {
16 pub grid_width: usize, 30 fn default() -> Self {
31 Characters {
32 true_chr: '·',
33 false_chr: '·',
34 future_chr: '·',
35 }
36 }
37}
17 38
18 pub reached_color: Color, 39#[derive(Serialize, Deserialize)]
19 pub todo_color: Color, 40pub struct Colors {
20 pub future_color: Color, 41 #[serde(default = "cyan")]
42 pub reached: String,
43 #[serde(default = "magenta")]
44 pub todo: String,
45 #[serde(default = "light_black")]
46 pub inactive: String,
47}
48
49fn cyan() -> String {
50 "cyan".into()
51}
52fn magenta() -> String {
53 "magenta".into()
54}
55fn light_black() -> String {
56 "light black".into()
57}
58
59impl Default for Colors {
60 fn default() -> Self {
61 Colors {
62 reached: cyan(),
63 todo: magenta(),
64 inactive: light_black(),
65 }
66 }
67}
68
69#[derive(Serialize, Deserialize)]
70pub struct AppConfig {
71 #[serde(default)]
72 pub look: Characters,
73
74 #[serde(default)]
75 pub colors: Colors,
76}
77
78impl Default for AppConfig {
79 fn default() -> Self {
80 AppConfig {
81 look: Default::default(),
82 colors: Default::default(),
83 }
84 }
85}
86
87impl AppConfig {
88 // TODO: implement string parsing from config.json
89 pub fn reached_color(&self) -> Color {
90 return Color::parse(&self.colors.reached).unwrap_or(Color::Dark(BaseColor::Cyan));
91 }
92 pub fn todo_color(&self) -> Color {
93 return Color::parse(&self.colors.todo).unwrap_or(Color::Dark(BaseColor::Magenta));
94 }
95 pub fn inactive_color(&self) -> Color {
96 return Color::parse(&self.colors.inactive).unwrap_or(Color::Light(BaseColor::Black));
97 }
21} 98}
22 99
23pub fn load_configuration_file() -> AppConfig { 100pub fn load_configuration_file() -> AppConfig {
24 return AppConfig { 101 let cf = config_file();
25 true_chr: '·', 102 if let Ok(ref mut f) = File::open(&cf) {
26 false_chr: '·', 103 let mut j = String::new();
27 future_chr: '·', 104 f.read_to_string(&mut j);
28 view_width: 25, 105 return toml::from_str(&j).unwrap();
29 view_height: 8, 106 } else {
30 grid_width: 3, 107 if let Ok(dc) = toml::to_string(&AppConfig::default()) {
31 reached_color: Color::Dark(BaseColor::Cyan), 108 match OpenOptions::new().create(true).write(true).open(&cf) {
32 todo_color: Color::Dark(BaseColor::Magenta), 109 Ok(ref mut file) => file.write(dc.as_bytes()).unwrap(),
33 future_color: Color::Light(BaseColor::Black), 110 Err(_) => 0,
34 }; 111 };
112 }
113 return Default::default();
114 }
35} 115}
36 116
37fn project_dirs() -> ProjectDirs { 117fn project_dirs() -> ProjectDirs {
@@ -39,6 +119,14 @@ fn project_dirs() -> ProjectDirs {
39 .unwrap_or_else(|| panic!("Invalid home directory!")) 119 .unwrap_or_else(|| panic!("Invalid home directory!"))
40} 120}
41 121
122pub fn config_file() -> PathBuf {
123 let proj_dirs = project_dirs();
124 let mut data_file = PathBuf::from(proj_dirs.config_dir());
125 fs::create_dir_all(&data_file);
126 data_file.push("config.toml");
127 return data_file;
128}
129
42pub fn habit_file() -> PathBuf { 130pub fn habit_file() -> PathBuf {
43 let proj_dirs = project_dirs(); 131 let proj_dirs = project_dirs();
44 let mut data_file = PathBuf::from(proj_dirs.data_dir()); 132 let mut data_file = PathBuf::from(proj_dirs.data_dir());
diff --git a/src/views.rs b/src/views.rs
index 24c8a4d..efd1391 100644
--- a/src/views.rs
+++ b/src/views.rs
@@ -8,6 +8,7 @@ use chrono::prelude::*;
8use chrono::{Duration, Local, NaiveDate}; 8use chrono::{Duration, Local, NaiveDate};
9 9
10use crate::habit::{Bit, Count, Habit, TrackEvent, ViewMode}; 10use crate::habit::{Bit, Count, Habit, TrackEvent, ViewMode};
11use crate::utils::VIEW_WIDTH;
11 12
12use crate::CONFIGURATION; 13use crate::CONFIGURATION;
13 14
@@ -36,14 +37,14 @@ where
36 let year = now.year(); 37 let year = now.year();
37 let month = now.month(); 38 let month = now.month();
38 39
39 let goal_reached_style = Style::from(CONFIGURATION.reached_color); 40 let goal_reached_style = Style::from(CONFIGURATION.reached_color());
40 let todo_style = Style::from(CONFIGURATION.todo_color); 41 let todo_style = Style::from(CONFIGURATION.todo_color());
41 let future_style = Style::from(CONFIGURATION.future_color); 42 let future_style = Style::from(CONFIGURATION.inactive_color());
42 43
43 let strikethrough = Style::from(Effect::Strikethrough); 44 let strikethrough = Style::from(Effect::Strikethrough);
44 45
45 let goal_status = 46 let goal_status =
46 self.view_month_offset() == 0 && self.reached_goal(Local::now().naive_utc().date()); 47 self.view_month_offset() == 0 && self.reached_goal(Local::now().naive_local().date());
47 48
48 printer.with_style( 49 printer.with_style(
49 Style::merge(&[ 50 Style::merge(&[
@@ -61,11 +62,7 @@ where
61 |p| { 62 |p| {
62 p.print( 63 p.print(
63 (0, 0), 64 (0, 0),
64 &format!( 65 &format!(" {:.width$} ", self.name(), width = VIEW_WIDTH - 6),
65 " {:.width$} ",
66 self.name(),
67 width = CONFIGURATION.view_width - 6
68 ),
69 ); 66 );
70 }, 67 },
71 ); 68 );
@@ -77,12 +74,20 @@ where
77 .collect::<Vec<_>>(); 74 .collect::<Vec<_>>();
78 for (week, line_nr) in days.chunks(7).zip(2..) { 75 for (week, line_nr) in days.chunks(7).zip(2..) {
79 let weekly_goal = self.goal() * week.len() as u32; 76 let weekly_goal = self.goal() * week.len() as u32;
80 let is_this_week = week.contains(&Local::now().naive_utc().date()); 77 let is_this_week = week.contains(&Local::now().naive_local().date());
81 let remaining = week.iter().map(|&i| self.remaining(i)).sum::<u32>(); 78 let remaining = week.iter().map(|&i| self.remaining(i)).sum::<u32>();
82 let completions = weekly_goal - remaining; 79 let completions = weekly_goal - remaining;
83 let full = CONFIGURATION.view_width - 8; 80 let full = VIEW_WIDTH - 8;
84 let bars_to_fill = if weekly_goal > 0 {(completions * full as u32) / weekly_goal} else {0}; 81 let bars_to_fill = if weekly_goal > 0 {
85 let percentage = if weekly_goal > 0 {(completions as f64 * 100.) / weekly_goal as f64} else {0.0}; 82 (completions * full as u32) / weekly_goal
83 } else {
84 0
85 };
86 let percentage = if weekly_goal > 0 {
87 (completions as f64 * 100.) / weekly_goal as f64
88 } else {
89 0.0
90 };
86 printer.with_style(future_style, |p| { 91 printer.with_style(future_style, |p| {
87 p.print((4, line_nr), &"─".repeat(full)); 92 p.print((4, line_nr), &"─".repeat(full));
88 }); 93 });
@@ -118,7 +123,7 @@ where
118 }); 123 });
119 } else { 124 } else {
120 printer.with_style(future_style, |p| { 125 printer.with_style(future_style, |p| {
121 p.print(coords, &format!("{:^3}", CONFIGURATION.future_chr)); 126 p.print(coords, &format!("{:^3}", CONFIGURATION.look.future_chr));
122 }); 127 });
123 } 128 }
124 i += 1; 129 i += 1;
@@ -141,7 +146,7 @@ where
141 } 146 }
142 147
143 fn on_event(&mut self, e: Event) -> EventResult { 148 fn on_event(&mut self, e: Event) -> EventResult {
144 let now = Local::now().naive_utc().date(); 149 let now = Local::now().naive_local().date();
145 if self.is_auto() { 150 if self.is_auto() {
146 return EventResult::Ignored; 151 return EventResult::Ignored;
147 } 152 }