aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/app.rs19
-rw-r--r--src/main.rs7
2 files changed, 24 insertions, 2 deletions
diff --git a/src/app.rs b/src/app.rs
index 5ba00bf..5b1fa9d 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -10,6 +10,7 @@ use cursive::{Printer, Vec2};
10use chrono::NaiveDate; 10use chrono::NaiveDate;
11 11
12use crate::habit::{Bit, Count, Habit, HabitWrapper}; 12use crate::habit::{Bit, Count, Habit, HabitWrapper};
13use crate::Command;
13use crate::CONFIGURATION; 14use crate::CONFIGURATION;
14 15
15use serde::{Deserialize, Serialize}; 16use serde::{Deserialize, Serialize};
@@ -125,6 +126,24 @@ impl App {
125 return serde_json::from_str(&j).unwrap(); 126 return serde_json::from_str(&j).unwrap();
126 } 127 }
127 128
129 pub fn parse_command(&mut self, input: &str) {
130 let c = Command::from_string(input);
131 match c {
132 Command::Add(name, kind, goal) => {
133 if kind == "count" {
134 self.add_habit(Box::new(Count::new(name, goal.unwrap_or(0))));
135 eprintln!("Found COUNT!");
136 } else if kind == "bit" {
137 self.add_habit(Box::new(Bit::new(name)));
138 eprintln!("Found BIT!");
139 }
140 }
141 _ => {
142 eprintln!("UNKNOWN COMMAND!");
143 }
144 }
145 }
146
128 // this function does IO 147 // this function does IO
129 // TODO: convert this into non-blocking async function 148 // TODO: convert this into non-blocking async function
130 fn save_state(&self) { 149 fn save_state(&self) {
diff --git a/src/main.rs b/src/main.rs
index 3e838e5..418ec3b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,14 +6,17 @@ use lazy_static::lazy_static;
6 6
7//use cursive::views::{Dialog, EditView, LinearLayout, ListView, SelectView}; 7//use cursive::views::{Dialog, EditView, LinearLayout, ListView, SelectView};
8use cursive::theme::{BaseColor, Color}; 8use cursive::theme::{BaseColor, Color};
9use cursive::views::NamedView;
9use cursive::Cursive; 10use cursive::Cursive;
10 11
11mod habit; 12mod habit;
12use crate::habit::{Bit, Count, Habit}; 13use crate::habit::{Bit, Count, Habit};
13 14
14mod app; 15mod app;
16mod command;
15mod theme; 17mod theme;
16use crate::app::{App, ViewMode}; 18use crate::app::{App, ViewMode};
19use crate::command::{open_command_window, Command};
17 20
18mod views; 21mod views;
19 22
@@ -77,13 +80,13 @@ fn main() {
77 // walking.insert_entry(NaiveDate::from_ymd(2020, 5, 14), false.into()); 80 // walking.insert_entry(NaiveDate::from_ymd(2020, 5, 14), false.into());
78 // walking.insert_entry(NaiveDate::from_ymd(2020, 5, 15), true.into()); 81 // walking.insert_entry(NaiveDate::from_ymd(2020, 5, 15), true.into());
79 82
80 // let mut app = App::new();
81 // app.add_habit(Box::new(gymming)); 83 // app.add_habit(Box::new(gymming));
82 // app.add_habit(Box::new(reading)); 84 // app.add_habit(Box::new(reading));
83 // app.add_habit(Box::new(walking)); 85 // app.add_habit(Box::new(walking));
84 86
85 let app = App::load_state(); 87 let app = App::load_state();
86 s.add_layer(app); 88 s.add_layer(NamedView::new("Main", app));
89 s.add_global_callback(':', |s| open_command_window(s));
87 90
88 s.set_theme(theme::theme_gen()); 91 s.set_theme(theme::theme_gen());
89 s.run(); 92 s.run();