|
|
|
@ -16,9 +16,12 @@ |
|
|
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
*/ |
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
use std::ffi::OsString; |
|
|
|
use std::fs::File; |
|
|
|
use std::fs::File; |
|
|
|
use std::io::{Read, Write}; |
|
|
|
use std::io::{Read, Write}; |
|
|
|
|
|
|
|
use std::path::PathBuf; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
use dirs::config_dir; |
|
|
|
use serde_derive::Deserialize; |
|
|
|
use serde_derive::Deserialize; |
|
|
|
use serde_derive::Serialize; |
|
|
|
use serde_derive::Serialize; |
|
|
|
use toml; |
|
|
|
use toml; |
|
|
|
@ -47,6 +50,7 @@ pub struct EventListIterator<'a> { |
|
|
|
pub enum EventListError { |
|
|
|
pub enum EventListError { |
|
|
|
InvalidDate, |
|
|
|
InvalidDate, |
|
|
|
TooOld, |
|
|
|
TooOld, |
|
|
|
|
|
|
|
NoStorage, |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
impl From<EventError> for EventListError { |
|
|
|
impl From<EventError> for EventListError { |
|
|
|
@ -65,15 +69,15 @@ impl EventList { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// TODO hide this
|
|
|
|
// TODO hide this
|
|
|
|
pub fn load() -> Self { |
|
|
|
pub fn load() -> Result<Self, EventListError> { |
|
|
|
if let Ok(mut fp) = File::open(FILENAME) { |
|
|
|
if let Ok(mut fp) = File::open(EventList::event_file()?) { |
|
|
|
let mut content = String::new(); |
|
|
|
let mut content = String::new(); |
|
|
|
fp.read_to_string(&mut content) |
|
|
|
fp.read_to_string(&mut content) |
|
|
|
.expect("Your event file is corrupted"); |
|
|
|
.expect("Your event file is corrupted"); |
|
|
|
// TODO remove toml
|
|
|
|
// TODO remove toml
|
|
|
|
toml::from_str(&content).unwrap_or(EventList::empty()) |
|
|
|
Ok(toml::from_str(&content).unwrap_or(EventList::empty())) |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
EventList::empty() |
|
|
|
Ok(EventList::empty()) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -84,22 +88,23 @@ impl EventList { |
|
|
|
|
|
|
|
|
|
|
|
// TODO turn this into the destructor
|
|
|
|
// TODO turn this into the destructor
|
|
|
|
// TODO if so, track changes
|
|
|
|
// TODO if so, track changes
|
|
|
|
pub fn save(&self) { |
|
|
|
pub fn save(&self) -> Result<(), EventListError> { |
|
|
|
// TODO remove toml
|
|
|
|
// TODO remove toml
|
|
|
|
let content = toml::to_string(&self).unwrap(); |
|
|
|
let content = toml::to_string(&self).unwrap(); |
|
|
|
if let Ok(mut fp) = File::create(FILENAME) { |
|
|
|
if let Ok(mut fp) = File::create(EventList::event_file()?) { |
|
|
|
fp.write_all(content.as_bytes()).unwrap(); |
|
|
|
fp.write_all(content.as_bytes()).unwrap(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
Ok(()) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// Load the event list, add an all day event, and save it back.
|
|
|
|
/// Load the event list, add an all day event, and save it back.
|
|
|
|
/// Returns the ID of the new event.
|
|
|
|
/// Returns the ID of the new event.
|
|
|
|
pub fn add_event_with_date(description: &str, date: &Date) -> Result<String, EventListError> { |
|
|
|
pub fn add_event_with_date(description: &str, date: &Date) -> Result<String, EventListError> { |
|
|
|
let mut list = EventList::load(); |
|
|
|
let mut list = EventList::load()?; |
|
|
|
let event = Event::new_on_date(description, date)?; |
|
|
|
let event = Event::new_on_date(description, date)?; |
|
|
|
let id = String::from(&event.id); |
|
|
|
let id = String::from(&event.id); |
|
|
|
list.push(event); |
|
|
|
list.push(event); |
|
|
|
list.save(); |
|
|
|
list.save()?; |
|
|
|
Ok(id) |
|
|
|
Ok(id) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -109,13 +114,23 @@ impl EventList { |
|
|
|
description: &str, |
|
|
|
description: &str, |
|
|
|
datetime: &DateTime, |
|
|
|
datetime: &DateTime, |
|
|
|
) -> Result<String, EventListError> { |
|
|
|
) -> Result<String, EventListError> { |
|
|
|
let mut list = EventList::load(); |
|
|
|
let mut list = EventList::load()?; |
|
|
|
let event = Event::new_on_date_time(description, datetime)?; |
|
|
|
let event = Event::new_on_date_time(description, datetime)?; |
|
|
|
let id = String::from(&event.id); |
|
|
|
let id = String::from(&event.id); |
|
|
|
list.push(event); |
|
|
|
list.push(event); |
|
|
|
list.save(); |
|
|
|
list.save()?; |
|
|
|
Ok(id) |
|
|
|
Ok(id) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// Full path for the event file.
|
|
|
|
|
|
|
|
fn event_file() -> Result<OsString, EventListError> { |
|
|
|
|
|
|
|
let base = config_dir().ok_or(EventListError::NoStorage)?; |
|
|
|
|
|
|
|
let mut path = PathBuf::new(); |
|
|
|
|
|
|
|
path.push(base); |
|
|
|
|
|
|
|
path.push(FILENAME); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ok(path.into_os_string()) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
impl<'a> IntoIterator for &'a EventList { |
|
|
|
impl<'a> IntoIterator for &'a EventList { |
|
|
|
|
