StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
Handle stalled Xtream series detail loads
Ensar Basri Kahvecieb866482594d
diff --git a/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.ktindex d27dabf6..112f5f63 100644--- a/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt+++ b/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt@@ -34,6 +34,7 @@ import kotlinx.coroutines.flow.flowOfimport kotlinx.coroutines.flow.flowOnimport kotlinx.coroutines.flow.mapimport kotlinx.coroutines.launch+import kotlinx.coroutines.withTimeoutOrNullimport com.streamvault.data.util.toFtsPrefixQueryimport com.streamvault.data.util.rankSearchResultsimport java.util.concurrent.ConcurrentHashMap@@ -74,6 +75,7 @@ class SeriesRepositoryImpl @Inject constructor(const val STALKER_PREVIEW_REQUIRED_COUNT_THRESHOLD = 24const val STALKER_PREVIEW_MAX_REMOTE_PAGES = 2const val DETAIL_REFRESH_TTL_MILLIS = 14L * 24L * 60L * 60L * 1000L+ const val XTREAM_DETAIL_HYDRATION_TIMEOUT_MILLIS = 8_000Lconst val CACHE_STATE_SUMMARY_ONLY = "SUMMARY_ONLY"const val CACHE_STATE_DETAIL_HYDRATED = "DETAIL_HYDRATED"}@@ -340,7 +342,17 @@ class SeriesRepositoryImpl @Inject constructor(val remoteResult = try {when (provider.type) {- ProviderType.XTREAM_CODES -> getOrCreateXtreamProvider(providerId, provider).getSeriesInfo(seriesEntity.seriesId)+ ProviderType.XTREAM_CODES -> withTimeoutOrNull(XTREAM_DETAIL_HYDRATION_TIMEOUT_MILLIS) {+ getOrCreateXtreamProvider(providerId, provider).getSeriesInfo(seriesEntity.seriesId)+ } ?: run {+ xtreamContentIndexDao.markDetailHydrationError(+ providerId = providerId,+ contentType = ContentType.SERIES.name,+ remoteId = seriesEntity.providerSeriesId?.takeIf { it.isNotBlank() } ?: seriesEntity.seriesId.toString(),+ errorState = "DETAIL_FAILED_TIMEOUT"+ )+ return Result.success(buildSeriesWithPersistedEpisodes(seriesEntity))+ }ProviderType.STALKER_PORTAL -> createStalkerProvider(providerId, provider).getSeriesInfo(seriesEntity.providerSeriesId?.takeIf { it.isNotBlank() } ?: seriesEntity.seriesId.toString())diff --git a/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.ktindex fbd5ca24..5a88da39 100644--- a/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt+++ b/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt@@ -47,11 +47,13 @@ import com.streamvault.domain.repository.PlaybackHistoryRepositoryimport kotlinx.coroutines.flow.firstimport kotlinx.coroutines.flow.flowimport kotlinx.coroutines.flow.flowOf+import kotlinx.coroutines.delayimport kotlinx.coroutines.test.runTestimport org.junit.Testimport org.mockito.kotlin.anyimport org.mockito.kotlin.anyOrNullimport org.mockito.kotlin.argumentCaptor+import org.mockito.kotlin.doSuspendableAnswerimport org.mockito.kotlin.eqimport org.mockito.kotlin.mockimport org.mockito.kotlin.never@@ -384,6 +386,50 @@ class SeriesRepositoryImplTest {assertThat(series.posterUrl).isEqualTo("https://img.example.test/poster.jpg")}+ @Test+ fun `getSeriesDetails returns local series when xtream details hang`() = runTest {+ whenever(preferencesRepository.xtreamBase64TextCompatibility).thenReturn(flowOf(false))+ val seriesEntity = SeriesEntity(+ id = 15L,+ seriesId = 301L,+ name = "Stored Series",+ posterUrl = "https://img.example.test/poster.jpg",+ providerId = 7L+ )+ whenever(seriesDao.getById(301L)).thenReturn(null)+ whenever(seriesDao.getBySeriesId(7L, 301L)).thenReturn(seriesEntity)+ whenever(providerDao.getById(7L)).thenReturn(+ ProviderEntity(+ id = 7L,+ name = "Xtream",+ type = ProviderType.XTREAM_CODES,+ serverUrl = "http://example.com",+ username = "user",+ password = "pass",+ status = ProviderStatus.ACTIVE+ )+ )+ whenever(episodeDao.getBySeriesSync(15L)).thenReturn(emptyList())+ whenever(xtreamApiService.getSeriesInfo(any(), any())).doSuspendableAnswer {+ delay(30_000L)+ XtreamSeriesInfoResponse()+ }++ val result = createRepository().getSeriesDetails(7L, 301L)++ assertThat(result).isInstanceOf(com.streamvault.domain.model.Result.Success::class.java)+ val series = (result as com.streamvault.domain.model.Result.Success).data+ assertThat(series.id).isEqualTo(15L)+ assertThat(series.name).isEqualTo("Stored Series")+ assertThat(series.posterUrl).isEqualTo("https://img.example.test/poster.jpg")+ verify(xtreamContentIndexDao).markDetailHydrationError(+ providerId = eq(7L),+ contentType = eq(ContentType.SERIES.name),+ remoteId = eq("301"),+ errorState = eq("DETAIL_FAILED_TIMEOUT")+ )+ }+@Testfun `getSeriesDetails keeps persisted episodes when remote payload only has season metadata`() = runTest {whenever(preferencesRepository.xtreamBase64TextCompatibility).thenReturn(flowOf(false))