matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Update toml-query: 0.2.0 -> 0.3.0

Browse source
This commit is contained in:
Matthias Beyer 2017-07-09 21:54:56 +02:00
parent 86adb4d064
commit 35bffe827b
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libimagtimetrack/Cargo.toml
View file

@ -17,7 +17,7 @@ homepage = "http://imag-pim.org"
filters = "0.1" filters = "0.1"
chrono = "0.3" chrono = "0.3"
toml = "0.4" toml = "0.4"
toml-query = "0.2" toml-query = "0.3"
lazy_static = "0.2" lazy_static = "0.2"
[dependencies.libimagerror] [dependencies.libimagerror]

17
libimagtimetrack/src/event.rs
View file

@ -43,13 +43,13 @@ pub trait TimeTracking {
fn set_start_datetime(&mut self, dt: NaiveDateTime) -> Result<()>; fn set_start_datetime(&mut self, dt: NaiveDateTime) -> Result<()>;
fn get_start_datetime(&self) -> Result<NaiveDateTime>; fn get_start_datetime(&self) -> Result<Option<NaiveDateTime>>;
fn delete_start_datetime(&mut self) -> Result<()>; fn delete_start_datetime(&mut self) -> Result<()>;
fn set_end_datetime(&mut self, dt: NaiveDateTime) -> Result<()>; fn set_end_datetime(&mut self, dt: NaiveDateTime) -> Result<()>;
fn get_end_datetime(&self) -> Result<NaiveDateTime>; fn get_end_datetime(&self) -> Result<Option<NaiveDateTime>>;
fn delete_end_datetime(&mut self) -> Result<()>; fn delete_end_datetime(&mut self) -> Result<()>;
@ -68,7 +68,7 @@ impl TimeTracking for Entry {
.map(|_| ()) .map(|_| ())
} }
fn get_start_datetime(&self) -> Result<NaiveDateTime> { fn get_start_datetime(&self) -> Result<Option<NaiveDateTime>> {
self.get_header() self.get_header()
.read(DATE_TIME_START_HEADER_PATH) .read(DATE_TIME_START_HEADER_PATH)
.map_err_into(TTEK::HeaderReadError) .map_err_into(TTEK::HeaderReadError)
@ -91,7 +91,7 @@ impl TimeTracking for Entry {
.map(|_| ()) .map(|_| ())
} }
fn get_end_datetime(&self) -> Result<NaiveDateTime> { fn get_end_datetime(&self) -> Result<Option<NaiveDateTime>> {
self.get_header() self.get_header()
.read(DATE_TIME_END_HEADER_PATH) .read(DATE_TIME_END_HEADER_PATH)
.map_err_into(TTEK::HeaderReadError) .map_err_into(TTEK::HeaderReadError)
@ -123,13 +123,16 @@ impl TimeTracking for Entry {
} }
fn header_value_to_dt(val: &Value) -> Result<NaiveDateTime> { fn header_value_to_dt(val: Option<&Value>) -> Result<Option<NaiveDateTime>> {
match val { match val {
&Value::String(ref s) => { Some(&Value::String(ref s)) => {
NaiveDateTime::parse_from_str(s, DATE_TIME_FORMAT) NaiveDateTime::parse_from_str(s, DATE_TIME_FORMAT)
.map_err_into(TTEK::DateTimeParserError) .map_err_into(TTEK::DateTimeParserError)
.map(Some)
}, },
_ => Err(TTEK::HeaderFieldTypeError.into_error()) Some(_) => Err(TTEK::HeaderFieldTypeError.into_error()),
None => Ok(None),
} }
} }