bbara/Purefin
1
0
Fork 0
mirror of https://github.com/bbara04/Purefin.git synced 2026-07-23 19:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(repository): streamline season loading and update series state

Browse Source
This commit is contained in:
Barnabas Balogh
2026-06-22 19:20:20 +02:00
parent 1ac649e8ae
commit d80b283ded
1 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
data/src/main/java/hu/bbara/purefin/data/catalog/InMemoryLocalMediaRepository.kt
View File

@@ -139,46 +139,26 @@ class InMemoryLocalMediaRepository @Inject constructor(
private suspend fun loadSeasonsInternal(seriesId: UUID) { private suspend fun loadSeasonsInternal(seriesId: UUID) {
seriesState.value[seriesId]?.takeIf { it.seasons.isNotEmpty() }?.let { return } seriesState.value[seriesId]?.takeIf { it.seasons.isNotEmpty() }?.let { return }
val seasons = jellyfinApiClient.getSeasons(seriesId).map { it.toSeason() } val series = seriesState.value[seriesId] ?: throw RuntimeException("Series not found")
// Await the parallel loadSeries to populate the series entry. val updatedSeries = series.copy(
// Precondition: seriesId refers to a real series (selectSeries always uses a seasons = jellyfinApiClient.getSeasons(seriesId).map { it.toSeason() }
// SeriesDto from a real series list). If loadSeries returns without populating )
// state (null item / wrong type) this suspends until cancelled by structured seriesState.update { it + (updatedSeries.id to updatedSeries) }
// concurrency when a sibling load* call fails.
seriesState.first { it.containsKey(seriesId) }
seriesState.update { current ->
val existing = current[seriesId] ?: return@update current
if (existing.seasons.isNotEmpty()) return@update current
current + (seriesId to existing.copy(seasons = seasons))
}
} }
override suspend fun loadSeasonEpisodes(seriesId: UUID, seasonId: UUID) { override suspend fun loadSeasonEpisodes(seriesId: UUID, seasonId: UUID) {
// Fast path: season already cached with episodes or known empty — skip the fetch. loadSeasons(seriesId)
seriesState.value[seriesId]?.seasons?.firstOrNull { it.id == seasonId }?.let { cached ->
if (cached.episodes.isNotEmpty() || cached.episodeCount == 0) return
}
// Fetch first so this runs concurrently with loadSeries/loadSeasons when launched val series = seriesState.value[seriesId] ?: throw RuntimeException("Series not found")
// from selectSeries. Precondition: seasons are pre-loaded by selectSeries and
// seasonId is always a valid season from a real EpisodeDto in this path.
val serverUrl = userSessionRepository.serverUrl.first()
val episodes = jellyfinApiClient.getEpisodesInSeason(seriesId, seasonId)
.map { it.toEpisode(serverUrl) }
// Await the season to be present in state (immediate when pre-loaded; waits for
// the parallel loadSeasons otherwise).
seriesState.first { it[seriesId]?.seasons?.any { it.id == seasonId } == true }
// Re-check guard after await: a concurrent call may have filled episodes already.
val series = seriesState.value[seriesId] ?: return
val season = series.seasons.firstOrNull { it.id == seasonId } ?: return val season = series.seasons.firstOrNull { it.id == seasonId } ?: return
if (season.episodes.isNotEmpty() || season.episodeCount == 0) { if (season.episodes.isNotEmpty() || season.episodeCount == 0) {
return return
} }
val serverUrl = userSessionRepository.serverUrl.first()
val episodes = jellyfinApiClient.getEpisodesInSeason(seriesId, seasonId)
.map { it.toEpisode(serverUrl) }
seriesState.update { current -> seriesState.update { current ->
val currentSeries = current[seriesId] ?: return@update current val currentSeries = current[seriesId] ?: return@update current
val updatedSeries = currentSeries.copy( val updatedSeries = currentSeries.copy(