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(playback): add offline fallback for next-up episode resolution

Browse Source 
When offline, getNextUpPlayableMedias() only tried the Jellyfin API which silently returns an empty list on failure. This broke the queue population for offline playback, meaning no playlist was built and autoplay-next could never fire.

Add an offline fallback path that queries the Room database for the current episode's series, finds the next episodes ordered by (seasonIndex, index), and resolves them as downloaded PlayableMedia via getPlayableMedia().
This commit is contained in:
Barnabas Balogh
2026-06-12 16:20:17 +00:00
parent 4727cdcab1
commit fe66926335
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
data/src/main/java/hu/bbara/purefin/data/jellyfin/DefaultPlayableMediaRepository.kt
View File

@@ -8,6 +8,7 @@ import androidx.media3.common.util.UnstableApi
import hu.bbara.purefin.core.Offline import hu.bbara.purefin.core.Offline
import hu.bbara.purefin.core.data.LocalMediaRepository import hu.bbara.purefin.core.data.LocalMediaRepository
import hu.bbara.purefin.core.data.NetworkMonitor import hu.bbara.purefin.core.data.NetworkMonitor
import hu.bbara.purefin.core.data.OfflineMediaManager
import hu.bbara.purefin.core.data.PlayableMediaRepository import hu.bbara.purefin.core.data.PlayableMediaRepository
import hu.bbara.purefin.core.data.PlaybackMediaItemTag import hu.bbara.purefin.core.data.PlaybackMediaItemTag
import hu.bbara.purefin.core.data.PlaybackReportContext import hu.bbara.purefin.core.data.PlaybackReportContext
@@ -50,6 +51,7 @@ class DefaultPlayableMediaRepository @Inject constructor(
private val mediaDownloadController: MediaDownloadController, private val mediaDownloadController: MediaDownloadController,
private val networkMonitor: NetworkMonitor, private val networkMonitor: NetworkMonitor,
@param:Offline private val offlineMediaRepository: LocalMediaRepository, @param:Offline private val offlineMediaRepository: LocalMediaRepository,
private val offlineMediaManager: OfflineMediaManager,
) : PlayableMediaRepository { ) : PlayableMediaRepository {
override suspend fun getPlayableMedia(mediaId: UUID): PlayableMedia? = withContext(Dispatchers.IO) { override suspend fun getPlayableMedia(mediaId: UUID): PlayableMedia? = withContext(Dispatchers.IO) {
@@ -239,7 +241,8 @@ class DefaultPlayableMediaRepository @Inject constructor(
existingIds: Set<UUID>, existingIds: Set<UUID>,
count: Int, count: Int,
): List<PlayableMedia> = withContext(Dispatchers.IO) { ): List<PlayableMedia> = withContext(Dispatchers.IO) {
runCatching { // First try the online (Jellyfin API) path
val onlineResult = runCatching {
val episodes = jellyfinApiClient.getNextEpisodes(episodeId = episodeId, count = count) val episodes = jellyfinApiClient.getNextEpisodes(episodeId = episodeId, count = count)
episodes.mapNotNull { episode -> episodes.mapNotNull { episode ->
val id = episode.id ?: return@mapNotNull null val id = episode.id ?: return@mapNotNull null
@@ -249,8 +252,26 @@ class DefaultPlayableMediaRepository @Inject constructor(
getPlayableMedia(id) getPlayableMedia(id)
} }
}.getOrElse { error -> }.getOrElse { error ->
Timber.tag(TAG).w(error, "Unable to load next-up items for $episodeId") Timber.tag(TAG).w(error, "Unable to load next-up items from API for $episodeId")
emptyList() null // Signal that we should try the offline fallback
}
if (onlineResult != null) return@withContext onlineResult
// Offline fallback: find next episodes from the local database
Timber.tag(TAG).d("Falling back to offline next-up resolution for $episodeId")
val currentEpisode = offlineMediaRepository.getEpisode(episodeId).first() ?: return@withContext emptyList()
val seriesEpisodes = offlineMediaManager.getEpisodesBySeries(currentEpisode.seriesId)
.sortedWith(compareBy({ it.seasonIndex }, { it.index }))
val currentIndex = seriesEpisodes.indexOfFirst { it.id == episodeId }
if (currentIndex == -1) return@withContext emptyList()
seriesEpisodes
.drop(currentIndex + 1)
.take(count)
.filter { it.id !in existingIds }
.mapNotNull { nextEpisode ->
getPlayableMedia(nextEpisode.id)
} }
} }