Skip to content

fix: initialize watched cache before fetchSeasonProgress to prevent race condition #195

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
ProdigyV21 merged 1 commit into from
May 15, 2026
Merged

fix: initialize watched cache before fetchSeasonProgress to prevent race condition #195

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
18 changes: 15 additions & 3 deletions app/src/main/kotlin/com/arflix/tv/ui/screens/details/DetailsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,16 @@ class DetailsViewModel @Inject constructor(
async { mediaRepository.getSeasonEpisodes(mediaId, seasonToLoad) }
} else null

// For TV shows, fetch season progress (watched/total per season)
// For TV shows, fetch season progress (watched/total per season).
// IMPORTANT: Initialize watched cache FIRST so fetchSeasonProgress()
// can read from the in-memory cache rather than falling back to a
// backend query that may return stale or empty data. The async below
// starts immediately, but initializeWatchedCache() runs synchronously
// before it, ensuring the cache is populated before fetchSeasonProgress
// checks getWatchedEpisodesFromCache().
if (mediaType == MediaType.TV) {
runCatching { traktRepository.initializeWatchedCache() }
}
val seasonProgressDeferred = if (mediaType == MediaType.TV) {
async { fetchSeasonProgress(mediaId) }
} else null
Expand Down Expand Up @@ -1587,12 +1596,15 @@ class DetailsViewModel @Inject constructor(
traktRepository.markSeasonWatched(currentMediaId, season, episodeNumbers)
}

// 2. Remove from watch history concurrently (all episodes at once)
// 2. Remove from watch history FIRST (synchronous), before Supabase writes.
// This avoids a race condition where removeFromHistory deletes the
// just-written watched records, causing watched status to be lost on re-entry.
runCatching {
watchHistoryRepository.removeFromHistory(currentMediaId, season, null)
}

// 3. Concurrent Supabase writes for each episode (faster than sequential)
// 3. Concurrent Supabase writes for each episode (faster than sequential).
// These run AFTER removeFromHistory to ensure the watched records are the final state.
episodeNumbers.map { epNum ->
async {
runCatching {
Expand Down
Loading