Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

refactor: Update cache refresh logic and improve dependency management in sync tests

David Nashashd8a624a5331d
diff --git a/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt
index 30fb8c45..de4cf67b 100644
--- a/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt
+++ b/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt
@@ -1736,12 +1736,15 @@ class MovieRepositoryImpl @Inject constructor(
requiredCount: Int,
loadCompletely: Boolean = false
): Boolean {
- if (localCount > 0) return false
val now = System.currentTimeMillis()
+ if (hydration?.isComplete == true &&
+ ContentCachePolicy.shouldRefresh(hydration.lastHydratedAt, ContentCachePolicy.CATALOG_TTL_MILLIS, now)
+ ) return true
+ if (localCount > 0) return false
val hasEmptySuccessfulCheckpoint = localCount == 0 &&
(hydration?.lastSuccessfulPage ?: hydration?.lastLoadedPage ?: 0) > 0
if (hasEmptySuccessfulCheckpoint) return true
- if (hydration == null || (hydration.isComplete && ContentCachePolicy.shouldRefresh(hydration.lastHydratedAt, ContentCachePolicy.CATALOG_TTL_MILLIS, now))) return true
+ if (hydration == null) return true
if (hydration?.isComplete == true) return false
if (loadCompletely) return true
if (localCount >= requiredCount) return false
diff --git a/data/src/test/java/com/streamvault/data/provider/ProviderExecutionArchitectureTest.kt b/data/src/test/java/com/streamvault/data/provider/ProviderExecutionArchitectureTest.kt
index 89bf4240..cce7fb11 100644
--- a/data/src/test/java/com/streamvault/data/provider/ProviderExecutionArchitectureTest.kt
+++ b/data/src/test/java/com/streamvault/data/provider/ProviderExecutionArchitectureTest.kt
@@ -254,12 +254,14 @@ class ProviderExecutionArchitectureTest {
DependencyBudget(
path = "data/src/main/java/com/streamvault/data/sync/StalkerIndexContinuationCoordinator.kt",
className = "StalkerIndexContinuationCoordinator",
- maxConstructorDependencies = 11
+ // Startup reconciliation now includes the guide-row probe and recovery callback.
+ maxConstructorDependencies = 13
),
DependencyBudget(
path = "data/src/main/java/com/streamvault/data/sync/StalkerIncrementalIndexExecutor.kt",
className = "StalkerIncrementalIndexExecutor",
- maxConstructorDependencies = 1
+ // The executor also receives the configured wildcard page concurrency.
+ maxConstructorDependencies = 2
),
DependencyBudget(
path = "data/src/main/java/com/streamvault/data/sync/XtreamIncrementalIndexExecutor.kt",
@@ -269,7 +271,8 @@ class ProviderExecutionArchitectureTest {
DependencyBudget(
path = "data/src/main/java/com/streamvault/data/sync/SyncStatusPublicationCoordinator.kt",
className = "SyncStatusPublicationCoordinator",
- maxConstructorDependencies = 3
+ // Metadata publication can share the database transaction runner.
+ maxConstructorDependencies = 4
)
)
@@ -306,8 +309,12 @@ class ProviderExecutionArchitectureTest {
"data/src/main/java/com/streamvault/data/sync/StalkerIncrementalIndexExecutor.kt"
).readText()
assertThat(incremental).contains("suspend fun processSummary(")
- assertThat(incremental).contains("private suspend fun processWildcard(")
- assertThat(incremental).contains("StalkerIndexPolicy.detectPageAnomaly")
+ assertThat(incremental).contains("StalkerPagedCatalogImporter")
+ val pagedImporter = repositoryRoot.resolve(
+ "data/src/main/java/com/streamvault/data/sync/StalkerPagedCatalogImporter.kt"
+ ).readText()
+ assertThat(pagedImporter).contains("private inner class Import(")
+ assertThat(pagedImporter).contains("StalkerIndexPolicy.detectPageAnomaly")
val xtreamIncremental = repositoryRoot.resolve(
"data/src/main/java/com/streamvault/data/sync/XtreamIncrementalIndexExecutor.kt"
diff --git a/data/src/test/java/com/streamvault/data/sync/AutomaticSyncRegressionTest.kt b/data/src/test/java/com/streamvault/data/sync/AutomaticSyncRegressionTest.kt
index bcc19587..8e037b9d 100644
--- a/data/src/test/java/com/streamvault/data/sync/AutomaticSyncRegressionTest.kt
+++ b/data/src/test/java/com/streamvault/data/sync/AutomaticSyncRegressionTest.kt
@@ -4,6 +4,7 @@ import android.content.Context
import android.net.ConnectivityManager
import android.net.Network
import com.google.common.truth.Truth.assertThat
+import com.streamvault.data.local.DatabaseTransactionRunner
import com.streamvault.data.local.dao.RecordingRunDao
import com.streamvault.data.local.dao.XtreamIndexJobDao
import com.streamvault.data.local.entity.XtreamIndexJobEntity
@@ -75,13 +76,17 @@ class AutomaticSyncRegressionTest {
whenever(programs.countByProvider(7L)).thenReturn(0)
whenever(preferences.getHiddenCategoryIds(7L, ContentType.LIVE)).thenReturn(flowOf(emptySet()))
whenever(sources.refreshAllForProvider(7L)).thenReturn(Result.success(Unit))
+ whenever(sources.resolveForProvider(7L, emptySet()))
+ .thenReturn(com.streamvault.domain.model.EpgResolutionSummary())
val executor = ProviderEpgSyncExecutor(
preferencesRepository = preferences,
epgRepository = mock(),
epgSourceRepository = sources,
channelDao = mock(),
programDao = programs,
- transactionRunner = mock(),
+ transactionRunner = object : DatabaseTransactionRunner {
+ override suspend fun <T> inTransaction(block: suspend () -> T): T = block()
+ },
syncMetadataRepository = metadata,
stalkerPortalStateStore = mock(),
stalkerRequestCoordinator = mock(),
diff --git a/data/src/test/java/com/streamvault/data/sync/ProviderSyncWorkSchedulerIntegrationTest.kt b/data/src/test/java/com/streamvault/data/sync/ProviderSyncWorkSchedulerIntegrationTest.kt
index 79003c42..581c7aa5 100644
--- a/data/src/test/java/com/streamvault/data/sync/ProviderSyncWorkSchedulerIntegrationTest.kt
+++ b/data/src/test/java/com/streamvault/data/sync/ProviderSyncWorkSchedulerIntegrationTest.kt
@@ -32,7 +32,7 @@ class ProviderSyncWorkSchedulerIntegrationTest {
scheduler.scheduleStalkerIndex(987956L, automatic = true, initialDelaySeconds = 3600L)
}
scheduler.scheduleStalkerIndex(987956L, automatic = false, initialDelaySeconds = 3600L)
- val manual = manager.getWorkInfosForUniqueWork(providerWorkUniqueName(987956L)).get().single { !it.state.isFinished }
+ val manual = manager.getWorkInfosForUniqueWork(stalkerIndexWorkUniqueName(987956L)).get().single { !it.state.isFinished }
assertThat(manual.constraints.requiresCharging()).isFalse()
assertThat(manager.getWorkInfosForUniqueWork(providerAutomaticIndexWorkUniqueName(987956L)).get().all { it.state.isFinished }).isTrue()
withContext(AutomaticSyncExecution.policy.asContextElement(AutomaticSyncSettings(chargingOnly = true))) {
@@ -41,7 +41,7 @@ class ProviderSyncWorkSchedulerIntegrationTest {
withContext(AutomaticSyncExecution.policy.asContextElement(AutomaticSyncSettings(chargingOnly = false))) {
scheduler.scheduleStalkerIndex(987956L, automatic = true, initialDelaySeconds = 3600L)
}
- val retained = manager.getWorkInfosForUniqueWork(providerWorkUniqueName(987956L)).get().single { !it.state.isFinished }
+ val retained = manager.getWorkInfosForUniqueWork(stalkerIndexWorkUniqueName(987956L)).get().single { !it.state.isFinished }
assertThat(retained.id).isEqualTo(manual.id)
}
diff --git a/data/src/test/java/com/streamvault/data/sync/StalkerMovieRefreshRegressionTest.kt b/data/src/test/java/com/streamvault/data/sync/StalkerMovieRefreshRegressionTest.kt
index b086d218..50017763 100644
--- a/data/src/test/java/com/streamvault/data/sync/StalkerMovieRefreshRegressionTest.kt
+++ b/data/src/test/java/com/streamvault/data/sync/StalkerMovieRefreshRegressionTest.kt
@@ -59,5 +59,9 @@ class StalkerMovieRefreshRegressionTest {
)
val willFetch = predicate.invoke(repository, oldComplete, 100, 200, false) as Boolean
assertThat(willFetch).isTrue()
+
+ val freshComplete = oldComplete.copy(lastHydratedAt = System.currentTimeMillis())
+ val willReuseFreshCache = predicate.invoke(repository, freshComplete, 100, 200, false) as Boolean
+ assertThat(willReuseFreshCache).isFalse()
}
}
diff --git a/data/src/test/java/com/streamvault/data/sync/SyncManagerM3uImporterTest.kt b/data/src/test/java/com/streamvault/data/sync/SyncManagerM3uImporterTest.kt
index 2b5e7717..18277359 100644
--- a/data/src/test/java/com/streamvault/data/sync/SyncManagerM3uImporterTest.kt
+++ b/data/src/test/java/com/streamvault/data/sync/SyncManagerM3uImporterTest.kt
@@ -157,8 +157,8 @@ class SyncManagerM3uImporterTest {
doAnswer { invocation ->
@Suppress("UNCHECKED_CAST")
stagedChannels = (invocation.arguments[2] as List<com.streamvault.data.local.entity.ChannelEntity>).toList()
- Unit
- }.whenever(fixture.store).stageChannelBatch(any(), any(), any())
+ stagedChannels.size
+ }.whenever(fixture.store).stageM3uChannelBatch(any(), any(), any())
fixture.importer.importPlaylist(provider(), onProgress = null)
@@ -181,8 +181,8 @@ class SyncManagerM3uImporterTest {
doAnswer { invocation ->
@Suppress("UNCHECKED_CAST")
stagedChannels = (invocation.arguments[2] as List<com.streamvault.data.local.entity.ChannelEntity>).toList()
- Unit
- }.whenever(fixture.store).stageChannelBatch(any(), any(), any())
+ stagedChannels.size
+ }.whenever(fixture.store).stageM3uChannelBatch(any(), any(), any())
fixture.importer.importPlaylist(provider(), onProgress = null)
@@ -202,8 +202,8 @@ class SyncManagerM3uImporterTest {
doAnswer { invocation ->
@Suppress("UNCHECKED_CAST")
stagedChannels = (invocation.arguments[2] as List<com.streamvault.data.local.entity.ChannelEntity>).toList()
- Unit
- }.whenever(fixture.store).stageChannelBatch(any(), any(), any())
+ stagedChannels.size
+ }.whenever(fixture.store).stageM3uChannelBatch(any(), any(), any())
val stats = fixture.importer.importPlaylist(
provider(vodClassificationEnabled = false),
@@ -228,8 +228,8 @@ class SyncManagerM3uImporterTest {
doAnswer { invocation ->
@Suppress("UNCHECKED_CAST")
stagedMovies = (invocation.arguments[2] as List<com.streamvault.data.local.entity.MovieEntity>).toList()
- Unit
- }.whenever(fixture.store).stageMovieBatch(any(), any(), any())
+ stagedMovies.size
+ }.whenever(fixture.store).stageM3uMovieBatch(any(), any(), any())
val stats = fixture.importer.importPlaylist(
provider(vodClassificationEnabled = true),
@@ -297,7 +297,7 @@ class SyncManagerM3uImporterTest {
Triple(
liveEntries,
CatalogSizeLimits(maxChannelsPerProvider = 1, maxM3uDecompressedBytes = 8_192, maxM3uLineBytes = 1_024),
- "live-channel limit"
+ "channel limit"
),
Triple(
movieEntries,
@@ -360,7 +360,7 @@ class SyncManagerM3uImporterTest {
)
doAnswer { throw IOException("database full") }
.whenever(fixture.store)
- .stageChannelBatch(any(), any(), any())
+ .stageM3uChannelBatch(any(), any(), any())
val failure = runCatching {
fixture.importer.importPlaylist(provider(), onProgress = null, batchSize = 1)
@@ -379,7 +379,7 @@ class SyncManagerM3uImporterTest {
)
doAnswer { throw CancellationException("cancelled") }
.whenever(fixture.store)
- .stageChannelBatch(any(), any(), any())
+ .stageM3uChannelBatch(any(), any(), any())
val failure = runCatching {
fixture.importer.importPlaylist(provider(), onProgress = null, batchSize = 1)
@@ -399,6 +399,30 @@ class SyncManagerM3uImporterTest {
): Fixture {
val store = mock<SyncCatalogStore>()
whenever(store.newSessionId()).thenReturn(SESSION_ID)
+ val stagedChannelIds = mutableSetOf<Long>()
+ whenever(store.stageM3uChannelBatch(any(), any(), any())).thenAnswer { invocation ->
+ val incomingIds = invocation.getArgument<List<com.streamvault.data.local.entity.ChannelEntity>>(2)
+ .map { it.streamId }
+ .distinct()
+ .filterNot(stagedChannelIds::contains)
+ if (stagedChannelIds.size + incomingIds.size > limits.maxChannelsPerProvider) {
+ throw CatalogAdmissionExceeded("Staged channel limit exceeded")
+ }
+ stagedChannelIds.addAll(incomingIds)
+ incomingIds.size
+ }
+ val stagedMovieIds = mutableSetOf<Long>()
+ whenever(store.stageM3uMovieBatch(any(), any(), any())).thenAnswer { invocation ->
+ val incomingIds = invocation.getArgument<List<com.streamvault.data.local.entity.MovieEntity>>(2)
+ .map { it.streamId }
+ .distinct()
+ .filterNot(stagedMovieIds::contains)
+ if (stagedMovieIds.size + incomingIds.size > limits.maxMoviesPerProvider) {
+ throw CatalogAdmissionExceeded("Staged movie limit exceeded")
+ }
+ stagedMovieIds.addAll(incomingIds)
+ incomingIds.size
+ }
val fixture = Fixture(store)
doAnswer {
fixture.finalized = true
diff --git a/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt b/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt
index 67949ef7..9c945a39 100644
--- a/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt
+++ b/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt
@@ -385,6 +385,14 @@ class SyncManagerTest {
org.mockito.kotlin.whenever(catalogSyncDao.getChannelStages(any(), any())).thenReturn(emptyList())
org.mockito.kotlin.whenever(catalogSyncDao.getMovieStages(any(), any())).thenReturn(emptyList())
org.mockito.kotlin.whenever(catalogSyncDao.getSeriesStages(any(), any())).thenReturn(emptyList())
+ org.mockito.kotlin.whenever(catalogSyncDao.insertM3uChannelStagesIgnoringConflicts(any())).thenAnswer { invocation ->
+ val rows = invocation.getArgument<List<com.streamvault.data.local.entity.ChannelImportStageEntity>>(0)
+ rows.indices.map { (it + 1).toLong() }
+ }
+ org.mockito.kotlin.whenever(catalogSyncDao.insertM3uMovieStagesIgnoringConflicts(any())).thenAnswer { invocation ->
+ val rows = invocation.getArgument<List<com.streamvault.data.local.entity.MovieImportStageEntity>>(0)
+ rows.indices.map { (it + 1).toLong() }
+ }
val liveStages = java.util.concurrent.ConcurrentHashMap<Pair<Long, Long>, java.util.concurrent.ConcurrentHashMap<Long, com.streamvault.data.local.entity.ChannelImportStageEntity>>()
org.mockito.kotlin.whenever(catalogSyncDao.insertChannelStages(any())).thenAnswer { invocation ->
invocation.getArgument<List<com.streamvault.data.local.entity.ChannelImportStageEntity>>(0).forEach { row ->
@@ -4977,8 +4985,8 @@ class SyncManagerTest {
error("${result.message}: ${result.exception?.stackTraceToString()}")
}
assertThat(result.isSuccess).isTrue()
- verify(catalogSyncDao, atLeast(3)).insertChannelStages(any())
- verify(catalogSyncDao, atLeastOnce()).insertMovieStages(any())
+ verify(catalogSyncDao, atLeast(3)).insertM3uChannelStagesIgnoringConflicts(any())
+ verify(catalogSyncDao, atLeastOnce()).insertM3uMovieStagesIgnoringConflicts(any())
}
@Test
@@ -5000,7 +5008,7 @@ class SyncManagerTest {
error(result.message)
}
assertThat(result.isSuccess).isTrue()
- verify(catalogSyncDao, atLeastOnce()).insertChannelStages(any())
+ verify(catalogSyncDao, atLeastOnce()).insertM3uChannelStagesIgnoringConflicts(any())
}
@Test
@@ -5031,7 +5039,7 @@ class SyncManagerTest {
val state = mgr.currentSyncState(1L)
assertThat(state).isInstanceOf(SyncState.Success::class.java)
val insertedChannels = argumentCaptor<List<com.streamvault.data.local.entity.ChannelImportStageEntity>>()
- verify(catalogSyncDao, atLeastOnce()).insertChannelStages(insertedChannels.capture())
+ verify(catalogSyncDao, atLeastOnce()).insertM3uChannelStagesIgnoringConflicts(insertedChannels.capture())
assertThat(insertedChannels.allValues.flatten()).hasSize(1)
}