Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix parsing when the local tz offset spans across midnight #55

Closed
wants to merge 2 commits into from
Closed

Fix parsing when the local tz offset spans across midnight #55

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bba136
Call parse_relative_time from parse_relative_time_at_date
sruggier Oct 4, 2023
2786540
Remove unused parse_relative_time_at_date function
sruggier Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 6 additions & 66 deletions src/parse_relative_time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
use crate::ParseDateTimeError;
use chrono::{Duration, Local, NaiveDate, Utc};
use chrono::Duration;
use regex::Regex;
/// Parses a relative time string and returns a `Duration` representing the
/// relative time.
Expand Down Expand Up @@ -40,26 +40,6 @@ use regex::Regex;
///
/// ```
pub fn parse_relative_time(s: &str) -> Result<Duration, ParseDateTimeError> {
parse_relative_time_at_date(Utc::now().date_naive(), s)
}

/// Parses a duration string and returns a `Duration` instance, with the duration
/// calculated from the specified date.
///
/// # Arguments
///
/// * `date` - A `Date` instance representing the base date for the calculation
/// * `s` - A string slice representing the relative time.
///
/// # Errors
///
/// This function will return `Err(ParseDateTimeError::InvalidInput)` if the input string
/// cannot be parsed as a relative time.
/// ```
pub fn parse_relative_time_at_date(
date: NaiveDate,
s: &str,
) -> Result<Duration, ParseDateTimeError> {
let time_pattern: Regex = Regex::new(
r"(?x)
(?:(?P<value>[-+]?\d*)\s*)?
Expand Down Expand Up @@ -139,19 +119,16 @@ pub fn parse_relative_time_at_date(
if captures_processed == 0 {
Err(ParseDateTimeError::InvalidInput)
} else {
let time_now = Local::now().date_naive();
let date_duration = date - time_now;

Ok(total_duration + date_duration)
Ok(total_duration)
}
}

#[cfg(test)]
mod tests {

use super::parse_relative_time;
use super::ParseDateTimeError;
use super::{parse_relative_time, parse_relative_time_at_date};
use chrono::{Duration, Local, NaiveDate, Utc};
use chrono::Duration;

#[test]
fn test_years() {
Expand Down Expand Up @@ -372,32 +349,6 @@ mod tests {
}*/
}

#[test]
fn test_parse_relative_time_at_date() {
let date = NaiveDate::from_ymd_opt(2014, 9, 5).unwrap();
let now = Local::now().date_naive();
let days_diff = (date - now).num_days();

assert_eq!(
parse_relative_time_at_date(date, "1 day").unwrap(),
Duration::days(days_diff + 1)
);

assert_eq!(
parse_relative_time_at_date(date, "2 hours").unwrap(),
Duration::days(days_diff) + Duration::hours(2)
);
}

#[test]
fn test_invalid_input_at_date() {
let date = NaiveDate::from_ymd_opt(2014, 9, 5).unwrap();
assert!(matches!(
parse_relative_time_at_date(date, "invalid"),
Err(ParseDateTimeError::InvalidInput)
));
}

#[test]
fn test_direction() {
assert_eq!(
Expand Down Expand Up @@ -599,24 +550,13 @@ mod tests {
);
}

#[test]
fn test_parse_relative_time_at_date_day() {
let today = Utc::now().date_naive();
let yesterday = today - Duration::days(1);
assert_eq!(
parse_relative_time_at_date(yesterday, "2 days").unwrap(),
Duration::days(1)
);
}

#[test]
fn test_invalid_input_at_date_relative() {
let today = Utc::now().date_naive();
let result = parse_relative_time_at_date(today, "foobar");
let result = parse_relative_time("foobar");
println!("{result:?}");
assert_eq!(result, Err(ParseDateTimeError::InvalidInput));

let result = parse_relative_time_at_date(today, "invalid 1r");
let result = parse_relative_time("invalid 1r");
assert_eq!(result, Err(ParseDateTimeError::InvalidInput));
}
}