mirror-github-bspeice/dtparse
1
0
Fork 0
mirror of https://github.com/bspeice/dtparse synced 2025-07-01 05:46:14 -04:00
Code Issues Releases Wiki Activity

A lot of ignoretz is working!

Browse Source 
TZ support in Rust kinda sucks though.
This commit is contained in:
Bradlee Speice
2018-06-03 23:48:56 -04:00
parent 451aa2aeb5
commit 08a781175e
2 changed files with 132 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib.rs
View File

@ -776,8 +776,8 @@ impl Parser {
let naive = self.build_naive(&res, &default_ts);
if !ignoretz {
let offset = self.build_tzaware(&naive, &res, &default_ts);
Ok((naive, offset.unwrap(), tokens))
let offset = self.build_tzaware(&naive, &res, &default_ts)?;
Ok((naive, offset, tokens))
} else {
Ok((naive, None, tokens))
}
@ -1010,12 +1010,15 @@ impl Parser {
default: &NaiveDateTime,
) -> ParseResult<Option<FixedOffset>> {
// TODO: Actual timezone support
if res.tzname.is_none() && res.tzoffset.is_none() || res.tzname == Some(" ".to_owned())
|| res.tzname == Some(".".to_owned())
if let Some(offset) = res.tzoffset {
Ok(Some(FixedOffset::east(offset)))
} else if res.tzoffset == None
&& (res.tzname == Some(" ".to_owned()) || res.tzname == Some(".".to_owned())
|| res.tzname == Some("-".to_owned()) || res.tzname == None)
{
Ok(None)
} else {
println!("Tzname: {:?}, Tzoffset: {:?}", res.tzname, res.tzoffset);
println!("{:?}, {:?}", res.tzname, res.tzoffset);
Err(ParseError::TimezoneUnsupported)
}
}