aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/app.rs31
1 files changed, 20 insertions, 11 deletions
diff --git a/src/app.rs b/src/app.rs
index a64083b..412cfe5 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -1,3 +1,4 @@
1use std::default::Default;
1use std::f64; 2use std::f64;
2use std::fs::{File, OpenOptions}; 3use std::fs::{File, OpenOptions};
3use std::io::prelude::*; 4use std::io::prelude::*;
@@ -14,23 +15,22 @@ use crate::utils;
14use crate::Command; 15use crate::Command;
15use crate::CONFIGURATION; 16use crate::CONFIGURATION;
16 17
17use serde::{Deserialize, Serialize};
18
19struct StatusLine(String, String); 18struct StatusLine(String, String);
20 19
21#[derive(Serialize, Deserialize)]
22pub struct App { 20pub struct App {
23 // holds app data 21 // holds app data
24 habits: Vec<Box<dyn HabitWrapper>>, 22 habits: Vec<Box<dyn HabitWrapper>>,
25 23
26 // serialization of the rest can be skipped
27 #[serde(skip)]
28 focus: usize, 24 focus: usize,
29
30 #[serde(skip)]
31 view_month_offset: u32, 25 view_month_offset: u32,
32} 26}
33 27
28impl Default for App {
29 fn default() -> Self {
30 App::new()
31 }
32}
33
34impl App { 34impl App {
35 pub fn new() -> Self { 35 pub fn new() -> Self {
36 return App { 36 return App {
@@ -161,7 +161,10 @@ impl App {
161 if let Ok(ref mut file) = File::open(data_file) { 161 if let Ok(ref mut file) = File::open(data_file) {
162 let mut j = String::new(); 162 let mut j = String::new();
163 file.read_to_string(&mut j); 163 file.read_to_string(&mut j);
164 return serde_json::from_str(&j).unwrap(); 164 return App {
165 habits: serde_json::from_str(&j).unwrap(),
166 ..Default::default()
167 };
165 } else { 168 } else {
166 Self::new() 169 Self::new()
167 } 170 }
@@ -170,10 +173,15 @@ impl App {
170 // this function does IO 173 // this function does IO
171 // TODO: convert this into non-blocking async function 174 // TODO: convert this into non-blocking async function
172 fn save_state(&self) { 175 fn save_state(&self) {
173 let j = serde_json::to_string_pretty(&self).unwrap(); 176 let j = serde_json::to_string_pretty(&self.habits).unwrap();
174 let data_file = utils::data_file(); 177 let data_file = utils::data_file();
175 178
176 match OpenOptions::new().write(true).create(true).open(data_file) { 179 match OpenOptions::new()
180 .write(true)
181 .create(true)
182 .truncate(true)
183 .open(data_file)
184 {
177 Ok(ref mut file) => file.write_all(j.as_bytes()).unwrap(), 185 Ok(ref mut file) => file.write_all(j.as_bytes()).unwrap(),
178 Err(_) => panic!("Unable to write!"), 186 Err(_) => panic!("Unable to write!"),
179 }; 187 };
@@ -274,7 +282,8 @@ impl View for App {
274 return EventResult::Consumed(None); 282 return EventResult::Consumed(None);
275 } 283 }
276 Event::Char('w') => { 284 Event::Char('w') => {
277 let j = serde_json::to_string_pretty(&self).unwrap(); 285 // helper bind to test write to file
286 let j = serde_json::to_string_pretty(&self.habits).unwrap();
278 let mut file = File::create("foo.txt").unwrap(); 287 let mut file = File::create("foo.txt").unwrap();
279 file.write_all(j.as_bytes()).unwrap(); 288 file.write_all(j.as_bytes()).unwrap();
280 return EventResult::Consumed(None); 289 return EventResult::Consumed(None);