Skip to content

Improve relative datetime parsing #27

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

Merged
itssimon merged 1 commit into from
Apr 22, 2026
Merged

Improve relative datetime parsing #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,21 @@ pub fn open_db(path: &Path) -> Result<duckdb::Connection> {
.with_context(|| format!("failed to open database {}", path.display()))
}

/// If `s` is a compact relative duration (`<digits><m|h|d|w>`, e.g. `24h`, `7d`), returns the
/// corresponding UTC instant as RFC 3339 (never naive). Otherwise returns `s` unchanged.
/// If `s` is a compact duration string (`<digits><m|h|d|w>`, e.g. `24h` or `7d`) or a simple
/// ISO 8601-style duration (`P14D`, `-P14D`, `PT24H`), returns the UTC instant that far in the
/// past as RFC 3339. Otherwise returns `s` unchanged.
pub fn resolve_relative_datetime(s: &str) -> String {
let b = s.as_bytes();
let normalized = s.to_ascii_lowercase();
let normalized = normalized.trim_start_matches(['-', 'p', 't']);
let b = normalized.as_bytes();
if b.len() < 2 {
return s.to_owned();
}
let unit = b[b.len() - 1];
if !matches!(unit, b'm' | b'h' | b'd' | b'w') {
return s.to_owned();
}
let prefix = &s[..s.len() - 1];
let prefix = &normalized[..normalized.len() - 1];
if prefix.is_empty() || !prefix.bytes().all(|c| c.is_ascii_digit()) {
return s.to_owned();
}
Expand Down Expand Up @@ -197,6 +200,14 @@ mod tests {
assert_approximately_now_minus(&resolve_relative_datetime("2h"), 2 * 3600);
assert_approximately_now_minus(&resolve_relative_datetime("3d"), 259_200);
assert_approximately_now_minus(&resolve_relative_datetime("1w"), 604_800);

assert_approximately_now_minus(&resolve_relative_datetime("P14D"), 14 * 86_400);
assert_approximately_now_minus(&resolve_relative_datetime("-P14D"), 14 * 86_400);
assert_approximately_now_minus(&resolve_relative_datetime("p14d"), 14 * 86_400);
assert_approximately_now_minus(&resolve_relative_datetime("-2H"), 2 * 3600);
assert_approximately_now_minus(&resolve_relative_datetime("PT24H"), 24 * 3600);
assert_approximately_now_minus(&resolve_relative_datetime("PT30M"), 30 * 60);
assert_approximately_now_minus(&resolve_relative_datetime("-PT30M"), 30 * 60);
}

#[test]
Expand Down
Loading