Skip to content

fix(tracking): parse RFC3339 timestamps in first_seen_days() #2711

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

Open
guyoron1 wants to merge 1 commit into
base: develop
Choose a base branch
from
+26 −3
Open

fix(tracking): parse RFC3339 timestamps in first_seen_days() #2711

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
29 changes: 26 additions & 3 deletions src/core/tracking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,9 +1105,15 @@ impl Tracker {
};
match oldest {
Some(ts) => {
let first = chrono::NaiveDateTime::parse_from_str(&ts, "%Y-%m-%dT%H:%M:%S")
.or_else(|_| chrono::NaiveDateTime::parse_from_str(&ts, "%Y-%m-%d %H:%M:%S"))
.map(|dt| dt.and_utc())
let first = chrono::DateTime::parse_from_rfc3339(&ts)
.map(|dt| dt.with_timezone(&chrono::Utc))
.or_else(|_| {
chrono::NaiveDateTime::parse_from_str(&ts, "%Y-%m-%dT%H:%M:%S")
.or_else(|_| {
chrono::NaiveDateTime::parse_from_str(&ts, "%Y-%m-%d %H:%M:%S")
})
.map(|dt| dt.and_utc())
})
.unwrap_or_else(|_| chrono::Utc::now());
let days = (chrono::Utc::now() - first).num_days();
Ok(days.max(0))
Expand Down Expand Up @@ -1686,4 +1692,21 @@ mod tests {
"parse_failures table should be empty after reset"
);
}

#[test]
fn test_first_seen_days_parses_rfc3339() {
let tracker = Tracker::new().expect("Failed to create tracker");
let test_cmd = format!("rtk first_seen_test_{}", std::process::id());
tracker
.record("first_seen_cmd", &test_cmd, 100, 20, 10)
.expect("Failed to record");

let days = tracker
.first_seen_days()
.expect("first_seen_days should not error");
assert!(
days >= 0,
"first_seen_days must be non-negative, got {days}"
);
}
}
Loading