fix: use Trakt runtime to derive watch start time (#225)

Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>

Author: RoMinjun

src/trakt.rs

@@ -70,13 +70,15 @@ pub struct TraktMovie {
     pub title: String,
     pub year: u16,
     pub ids: TraktIds,
+    pub runtime: Option<u16>,
 }
 
 #[derive(Deserialize, Debug, Clone, PartialEq)]
 pub struct TraktShow {
     pub title: String,
     pub year: u16,
     pub ids: TraktIds,
+    pub runtime: Option<u16>,
 }
 
 #[derive(Deserialize, Debug, Clone, PartialEq)]
@@ -85,6 +87,7 @@ pub struct TraktEpisode {
     pub number: u8,
     pub title: String,
     pub ids: TraktIds,
+    pub runtime: Option<u16>,
 }
 
 #[derive(Deserialize, Debug, Clone, PartialEq)]
@@ -221,10 +224,13 @@ impl Trakt {
             .is_some_and(|t| !t.is_empty());
 
         let endpoint = if has_oauth {
-            format!("{}/users/me/watching", self.trakt_base_url)
+            format!("{}/users/me/watching?extended=full", self.trakt_base_url)
         } else {
             let encoded = utf8_percent_encode(&self.username, NON_ALPHANUMERIC).to_string();
-            format!("{}/users/{}/watching", self.trakt_base_url, encoded)
+            format!(
+                "{}/users/{}/watching?extended=full",
+                self.trakt_base_url, encoded
+            )
         };
 
         let authorization = self.oauth_access_token.as_ref().and_then(|token| {

src/utils.rs

@@ -180,6 +180,8 @@ pub struct WatchStats {
     pub watch_percentage: String,
     pub start_date: DateTime<FixedOffset>,
     pub end_date: DateTime<FixedOffset>,
+    /// Runtime in minutes from Trakt (None if unavailable, using session times as fallback).
+    pub runtime_minutes: Option<u16>,
 }
 
 /// Result of polling for a device token.
@@ -788,17 +790,53 @@ pub fn set_restrictive_permissions(_path: &std::path::Path) {}
 pub fn get_watch_stats(trakt_response: &TraktWatchingResponse) -> WatchStats {
     let start_date = DateTime::parse_from_rfc3339(&trakt_response.started_at).unwrap();
     let end_date = DateTime::parse_from_rfc3339(&trakt_response.expires_at).unwrap();
-    let percentage = Utc::now().signed_duration_since(start_date).num_seconds() as f32
-        / end_date.signed_duration_since(start_date).num_seconds() as f32;
+
+    let runtime_minutes = extract_runtime_minutes(trakt_response);
+    let (start_date, end_date) = match runtime_minutes {
+        Some(minutes) => {
+            let duration = chrono::Duration::minutes(i64::from(minutes));
+            (end_date - duration, end_date)
+        }
+        None => {
+            tracing::trace!("No runtime available, using Trakt session times as fallback");
+            (start_date, end_date)
+        }
+    };
+
+    // Prevent division by zero if dates are somehow equal
+    let total_seconds = end_date
+        .signed_duration_since(start_date)
+        .num_seconds()
+        .max(1);
+    let percentage =
+        Utc::now().signed_duration_since(start_date).num_seconds() as f32 / total_seconds as f32;
     let watch_percentage = format!("{:.2}%", percentage * 100.0);
 
     WatchStats {
         watch_percentage,
         start_date,
         end_date,
+        runtime_minutes,
     }
 }
 
+fn extract_runtime_minutes(trakt_response: &TraktWatchingResponse) -> Option<u16> {
+    let minutes = match trakt_response.r#type.as_str() {
+        "movie" => trakt_response
+            .movie
+            .as_ref()
+            .and_then(|movie| movie.runtime),
+        "episode" => trakt_response
+            .episode
+            .as_ref()
+            .and_then(|episode| episode.runtime)
+            .or_else(|| trakt_response.show.as_ref().and_then(|show| show.runtime)),
+        _ => None,
+    };
+
+    minutes.filter(|&value| value > 0)
+}
+
 pub enum MediaType {
     Show,
     Movie,

tests/common/fixtures.rs

@@ -18,7 +18,8 @@ pub const TRAKT_MOVIE_WATCHING: &str = r#"{
             "imdb": "tt1375666",
             "tmdb": 27205,
             "tvrage": null
-        }
+        },
+        "runtime": 150
     }
 }"#;
 
@@ -50,7 +51,42 @@ pub const TRAKT_EPISODE_WATCHING: &str = r#"{
             "imdb": "tt2301451",
             "tmdb": 62161,
             "tvrage": null
-        }
+        },
+        "runtime": 60
+    }
+}"#;
+
+/// Trakt API: Episode watching response with stale started_at and runtime
+pub const TRAKT_EPISODE_WATCHING_STALE_START: &str = r#"{
+    "expires_at": "2024-01-15T11:00:00.000Z",
+    "started_at": "2024-01-15T08:00:00.000Z",
+    "action": "checkin",
+    "type": "episode",
+    "show": {
+        "title": "Stargate SG-1",
+        "year": 1997,
+        "ids": {
+            "trakt": 4605,
+            "slug": "stargate-sg-1",
+            "tvdb": 72449,
+            "imdb": "tt0118480",
+            "tmdb": 4629,
+            "tvrage": null
+        },
+        "runtime": 44
+    },
+    "episode": {
+        "season": 4,
+        "number": 7,
+        "title": "Watergate",
+        "ids": {
+            "trakt": 344183,
+            "tvdb": 85823,
+            "imdb": "tt0709217",
+            "tmdb": 335902,
+            "tvrage": null
+        },
+        "runtime": 44
     }
 }"#;
 

tests/discord_tests.rs

@@ -71,6 +71,7 @@ fn create_movie_response() -> TraktWatchingResponse {
                 tmdb: Some(27205),
                 tvrage: None,
             },
+            runtime: None,
         }),
         show: None,
         episode: None,
@@ -142,6 +143,7 @@ fn create_episode_response() -> TraktWatchingResponse {
                 tmdb: Some(1396),
                 tvrage: Some(18164),
             },
+            runtime: None,
         }),
         episode: Some(TraktEpisode {
             season: 5,
@@ -155,6 +157,7 @@ fn create_episode_response() -> TraktWatchingResponse {
                 tmdb: Some(62161),
                 tvrage: None,
             },
+            runtime: None,
         }),
     }
 }
@@ -243,6 +246,7 @@ fn test_build_payload_movie_missing_ids() {
                 tmdb: None,
                 tvrage: None,
             },
+            runtime: None,
         }),
         show: None,
         episode: None,

tests/trakt_tests.rs

@@ -245,6 +245,10 @@ fn test_get_watching_returns_movie() {
 
     let mock = server
         .mock("GET", "/users/testuser/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .match_header("trakt-api-version", "2")
         .match_header("trakt-api-key", "test_client")
         .with_status(200)
@@ -277,6 +281,10 @@ fn test_get_watching_returns_episode() {
 
     let mock = server
         .mock("GET", "/users/testuser/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .match_header("trakt-api-version", "2")
         .with_status(200)
         .with_header("content-type", "application/json")
@@ -309,6 +317,10 @@ fn test_get_watching_returns_none_when_not_watching() {
 
     let mock = server
         .mock("GET", "/users/testuser/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .with_status(204) // No Content
         .create();
 
@@ -333,6 +345,10 @@ fn test_get_watching_handles_401() {
 
     let mock = server
         .mock("GET", "/users/testuser/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .with_status(401)
         .create();
 
@@ -357,6 +373,10 @@ fn test_get_watching_handles_403() {
 
     let mock = server
         .mock("GET", "/users/testuser/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .with_status(403)
         .create();
 
@@ -382,6 +402,10 @@ fn test_get_watching_with_oauth_uses_me_endpoint() {
     // When OAuth token is present, should use /users/me/watching instead of /users/{username}/watching
     let mock = server
         .mock("GET", "/users/me/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .match_header("Authorization", "Bearer my_oauth_token")
         .with_status(200)
         .with_body(common::fixtures::TRAKT_MOVIE_WATCHING)
@@ -409,6 +433,10 @@ fn test_get_watching_encodes_special_chars_in_username() {
     // Username with spaces should be URL-encoded when no OAuth token is present
     let mock = server
         .mock("GET", "/users/john%20doe/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .with_status(200)
         .with_body(common::fixtures::TRAKT_MOVIE_WATCHING)
         .create();
@@ -435,6 +463,10 @@ fn test_get_watching_empty_oauth_uses_username_endpoint() {
     // Empty OAuth token should fall back to /users/{username}/watching
     let mock = server
         .mock("GET", "/users/testuser/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .with_status(200)
         .with_body(common::fixtures::TRAKT_MOVIE_WATCHING)
         .create();
@@ -1076,18 +1108,30 @@ fn test_get_watching_retries_on_503() {
     // First two calls return 503, third call succeeds
     let mock_503_first = server
         .mock("GET", "/users/testuser/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .with_status(503)
         .expect(1)
         .create();
 
     let mock_503_second = server
         .mock("GET", "/users/testuser/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .with_status(503)
         .expect(1)
         .create();
 
     let mock_success = server
         .mock("GET", "/users/testuser/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .with_status(200)
         .with_header("content-type", "application/json")
         .with_body(common::fixtures::TRAKT_MOVIE_WATCHING)
@@ -1127,18 +1171,30 @@ fn test_get_watching_retries_on_429() {
     // First two calls return 429 (rate limited), third call succeeds
     let mock_429_first = server
         .mock("GET", "/users/testuser/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .with_status(429)
         .expect(1)
         .create();
 
     let mock_429_second = server
         .mock("GET", "/users/testuser/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .with_status(429)
         .expect(1)
         .create();
 
     let mock_success = server
         .mock("GET", "/users/testuser/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .with_status(200)
         .with_header("content-type", "application/json")
         .with_body(common::fixtures::TRAKT_EPISODE_WATCHING)
@@ -1176,6 +1232,10 @@ fn test_get_watching_gives_up_after_max_retries() {
     // Server always returns 503 - should hit max_retries + 1 times (initial + retries)
     let mock_503 = server
         .mock("GET", "/users/testuser/watching")
+        .match_query(mockito::Matcher::UrlEncoded(
+            "extended".into(),
+            "full".into(),
+        ))
         .with_status(503)
         .expect(4) // 1 initial + 3 retries = 4 total attempts
         .create();

tests/utils_tests.rs

@@ -2,6 +2,7 @@
 
 mod common;
 
+use chrono::{DateTime, Duration};
 use discrakt::trakt::TraktWatchingResponse;
 #[cfg(target_os = "macos")]
 use discrakt::utils::is_light_mode;
@@ -80,6 +81,39 @@ fn test_get_watch_stats_dates_parsed() {
     assert!(stats.end_date.timestamp() > stats.start_date.timestamp());
 }
 
+#[test]
+fn test_get_watch_stats_uses_runtime_over_stale_start() {
+    let response: TraktWatchingResponse =
+        serde_json::from_str(common::fixtures::TRAKT_EPISODE_WATCHING_STALE_START).unwrap();
+
+    let stats = get_watch_stats(&response);
+
+    let end_date =
+        DateTime::parse_from_rfc3339("2024-01-15T11:00:00.000Z").expect("valid end date");
+    let expected_start = end_date - Duration::minutes(44);
+
+    assert_eq!(stats.end_date.timestamp(), end_date.timestamp());
+    assert_eq!(stats.start_date.timestamp(), expected_start.timestamp());
+    assert_eq!(stats.runtime_minutes, Some(44));
+}
+
+#[test]
+fn test_get_watch_stats_movie_with_runtime() {
+    // Movie fixture has runtime: 150
+    let response: TraktWatchingResponse =
+        serde_json::from_str(common::fixtures::TRAKT_MOVIE_WATCHING).unwrap();
+
+    let stats = get_watch_stats(&response);
+
+    let end_date =
+        DateTime::parse_from_rfc3339("2024-01-15T12:30:00.000Z").expect("valid end date");
+    let expected_start = end_date - Duration::minutes(150);
+
+    assert_eq!(stats.runtime_minutes, Some(150));
+    assert_eq!(stats.end_date.timestamp(), end_date.timestamp());
+    assert_eq!(stats.start_date.timestamp(), expected_start.timestamp());
+}
+
 // ============================================================================
 // Constants Tests
 // ============================================================================