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

Set up Python parse compat

Browse Source
This commit is contained in:
Bradlee Speice
2018-05-23 23:01:00 -04:00
parent 6a2c0a6304
commit b1f8cd77ee
7 changed files with 90 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/lib.rs
View File

@ -9,8 +9,6 @@ use chrono::Utc;
use std::collections::HashMap;
use std::vec::Vec;
#[cfg(test)]
mod test_python_compat;
#[cfg(test)]
mod tests;
@ -674,9 +672,7 @@ impl Default for Parser {
impl Parser {
pub fn new(info: ParserInfo) -> Self {
Parser {
info: info
}
Parser { info: info }
}
pub fn parse(
@ -692,34 +688,43 @@ impl Parser {
let default_ts = NaiveDateTime::new(default_date, NaiveTime::from_hms(0, 0, 0));
// TODO: What should be done with the tokens?
let (res, tokens) = self.parse_with_tokens(
timestr, self.info.dayfirst, self.info.yearfirst, true, true)?;
let (res, tokens) =
self.parse_with_tokens(timestr, self.info.dayfirst, self.info.yearfirst, true, true)?;
let naive = self.build_naive(&res, default_ts);
Ok(self.build_tzaware(naive, &res, default_ts))
}
fn parse_with_tokens(&self, timestr: String, dayfirst: bool, yearfirst: bool, fuzzy: bool,
fuzzy_with_tokens: bool) -> Result<(ParsingResult, Vec<String>), ParseError> {
fn parse_with_tokens(
&self,
timestr: String,
dayfirst: bool,
yearfirst: bool,
fuzzy: bool,
fuzzy_with_tokens: bool,
) -> Result<(ParsingResult, Vec<String>), ParseError> {
Err(ParseError::InvalidMonth)
}
fn build_naive(&self, res: &ParsingResult, default: NaiveDateTime) -> NaiveDateTime {
Local::now().naive_local()
}
fn build_tzaware(&self, dt: NaiveDateTime, res: &ParsingResult, default: NaiveDateTime) -> DateTime<Utc> {
fn build_tzaware(
&self,
dt: NaiveDateTime,
res: &ParsingResult,
default: NaiveDateTime,
) -> DateTime<Utc> {
Utc::now()
}
}
fn parse(timestr: String, parserinfo: Option<ParserInfo>) -> Result<DateTime<Utc>, ParseError> {
let parserinfo = parserinfo.unwrap_or(ParserInfo::default());
let parser = Parser::new(parserinfo);
fn parse_with_info(timestr: String, info: ParserInfo) -> Result<DateTime<Utc>, ParseError> {
let parser = Parser::new(info);
parser.parse(timestr, None, false, vec![])
}
fn parse(timestr: String) -> Result<DateTime<Utc>, ParseError> {
parse_with_info(timestr, ParserInfo::default())
}