refactor(lib): use jiff instead of chrono

Author: 0x6b

Cargo.lock

@@ -9,7 +9,9 @@ name = "github-streak-stats"
 path = "src/main.rs"
 
 [dependencies]
+# Error handling
 anyhow = "1.0.86"
+
 # Command line arguments parser
 clap = { version = "4.5.15", features = ["derive", "env", "wrap_help"] }
 

cli/Cargo.toml

@@ -136,7 +136,7 @@ fn main() -> Result<()> {
         TableCell::new("Longest and latest streak"),
         TableCell::new(format!(
             "{} days, from {} to {}",
-            (longest_streak.end - longest_streak.start).num_days() + 1,
+            (longest_streak.end - longest_streak.start).get_days() + 1,
             longest_streak.start,
             longest_streak.end,
         )),
@@ -146,7 +146,7 @@ fn main() -> Result<()> {
         TableCell::new("Current streak"),
         TableCell::new(format!(
             "{} days, from {} to {}",
-            (current_streak.end - current_streak.start).num_days() + 1,
+            (current_streak.end - current_streak.start).get_days() + 1,
             current_streak.start,
             current_streak.end,
         )),

cli/src/main.rs

@@ -6,7 +6,7 @@ description = "A library for fetching GitHub streak stats."
 
 [dependencies]
 anyhow = "1.0"
-chrono = "0.4"
+jiff = "0.1.5"
 graphql_client = { version = "0.14", features = ["reqwest-blocking", "reqwest-rustls"] }
 # pin the version to v0.11 until https://github.com/graphql-rust/graphql-client/pull/490 is merged
 reqwest = { version = "0.11", features = ["blocking"] }

lib/Cargo.toml

@@ -1,8 +1,8 @@
 use std::env;
 
 use anyhow::{anyhow, Result};
-use chrono::NaiveDate;
 use graphql_client::{reqwest::post_graphql_blocking, GraphQLQuery, Response};
+use jiff::{civil::Date, fmt::strtime::parse, Span};
 use reqwest::{
     blocking::Client,
     header::{HeaderValue, AUTHORIZATION},
@@ -62,10 +62,10 @@ impl GitHubClient {
     pub fn calc_streak_from_contributions(&self, contributions: &[Contribution]) -> Result<Stats> {
         let mut longest_streak = 0;
         let mut current_streak = 0;
-        let mut longest_streak_start = NaiveDate::MIN;
-        let mut longest_streak_end = NaiveDate::MIN;
-        let mut current_streak_start = NaiveDate::MIN;
-        let mut current_streak_end = NaiveDate::MIN;
+        let mut longest_streak_start = Date::MIN;
+        let mut longest_streak_end = Date::MIN;
+        let mut current_streak_start = Date::MIN;
+        let mut current_streak_end = Date::MIN;
         let mut total_contributions = 0;
 
         for c in contributions.iter() {
@@ -75,7 +75,8 @@ impl GitHubClient {
                 if current_streak >= longest_streak {
                     longest_streak = current_streak;
                     longest_streak_end = c.date;
-                    longest_streak_start = c.date - chrono::Duration::days(current_streak - 1);
+                    longest_streak_start =
+                        c.date.checked_sub(Span::new().days(current_streak - 1))?;
                 }
                 if current_streak == 1 {
                     current_streak_start = c.date;
@@ -117,7 +118,11 @@ impl GitHubClient {
             .into_iter()
             .flat_map(|week| week.contribution_days)
             .map(|day| Contribution {
-                date: NaiveDate::parse_from_str(&day.date, "%Y-%m-%d").unwrap(),
+                date: parse("%Y-%m-%d%z", format!("{}+0000", &day.date))
+                    .unwrap()
+                    .to_zoned()
+                    .unwrap()
+                    .date(),
                 contribution_count: day.contribution_count,
             })
             .collect::<Vec<_>>();

lib/src/github_client.rs

@@ -1,6 +1,5 @@
 use std::fmt::Display;
 
-use chrono::NaiveDate;
 use graphql_client::GraphQLQuery;
 
 // Have to define custom type for DateTime and Date as these are not standard type
@@ -43,7 +42,7 @@ pub struct UserQuery;
 #[derive(Debug)]
 pub struct Contribution {
     /// Date of the contribution
-    pub date: NaiveDate,
+    pub date: jiff::civil::Date,
     /// Number of contributions on that date
     pub contribution_count: i64,
 }
@@ -74,14 +73,14 @@ impl Display for User {
 /// Simple date range
 pub struct Streak {
     /// Start date
-    pub start: NaiveDate,
+    pub start: jiff::civil::Date,
     /// End date
-    pub end: NaiveDate,
+    pub end: jiff::civil::Date,
 }
 
-/// Converts a tuple of (NaiveDate, NaiveDate) to Streak
-impl From<(NaiveDate, NaiveDate)> for Streak {
-    fn from(value: (NaiveDate, NaiveDate)) -> Self {
+/// Converts a tuple of (Date, Date) to Streak
+impl From<(jiff::civil::Date, jiff::civil::Date)> for Streak {
+    fn from(value: (jiff::civil::Date, jiff::civil::Date)) -> Self {
         Self { start: value.0, end: value.1 }
     }
 }