Skip to content

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

fix(epg): isolate guide programs by stream id

David Nashash31790798e099
diff --git a/data/src/main/java/com/streamvault/data/epg/EpgResolutionEngine.kt b/data/src/main/java/com/streamvault/data/epg/EpgResolutionEngine.kt
index a6ef45f1..db26eaed 100644
--- a/data/src/main/java/com/streamvault/data/epg/EpgResolutionEngine.kt
+++ b/data/src/main/java/com/streamvault/data/epg/EpgResolutionEngine.kt
@@ -265,7 +265,7 @@ class EpgResolutionEngine @Inject constructor(
* For channels mapped to PROVIDER, reads from `programs`.
* For unmapped channels, returns empty.
*
- * Returns map keyed by the channel's `epgChannelId` (the lookup key used by the guide grid).
+ * Returns map keyed by the channel's stream ID when available, otherwise its `epgChannelId`.
*/
suspend fun getResolvedProgrammes(
providerId: Long,
@@ -316,8 +316,8 @@ class EpgResolutionEngine @Inject constructor(
for (mapping in sourceMappings) {
val channel = channelById[mapping.providerChannelId] ?: continue
- val lookupKey = channel.epgChannelId?.trim()?.takeIf(String::isNotEmpty)
- ?: channel.streamId.takeIf { it > 0L }?.toString()
+ val lookupKey = channel.streamId.takeIf { it > 0L }?.toString()
+ ?: channel.epgChannelId?.trim()?.takeIf(String::isNotEmpty)
?: continue
val progs = programsByXmltvId[mapping.xmltvChannelId]
?.map { it.toDomainProgram(providerId) }
@@ -352,8 +352,8 @@ class EpgResolutionEngine @Inject constructor(
for (mapping in providerMappings) {
val channel = channelById[mapping.providerChannelId] ?: continue
- val lookupKey = channel.epgChannelId?.trim()?.takeIf(String::isNotEmpty)
- ?: channel.streamId.takeIf { it > 0L }?.toString()
+ val lookupKey = channel.streamId.takeIf { it > 0L }?.toString()
+ ?: channel.epgChannelId?.trim()?.takeIf(String::isNotEmpty)
?: continue
// Don't overwrite external data (external wins if already resolved)
if (lookupKey !in result) {
diff --git a/data/src/main/java/com/streamvault/data/repository/EpgRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/EpgRepositoryImpl.kt
index 11663ccf..d7a4cb46 100644
--- a/data/src/main/java/com/streamvault/data/repository/EpgRepositoryImpl.kt
+++ b/data/src/main/java/com/streamvault/data/repository/EpgRepositoryImpl.kt
@@ -387,7 +387,7 @@ class EpgRepositoryImpl @Inject constructor(
endTime: Long
): List<Program> {
val normalizedChannelId = epgChannelId?.trim()?.takeIf { it.isNotEmpty() }
- val lookupKey = normalizedChannelId ?: streamId.takeIf { it > 0L }?.toString()
+ val lookupKey = streamId.takeIf { it > 0L }?.toString() ?: normalizedChannelId
val offsetMs = shiftMsFor(providerId)
if (internalChannelId > 0L && lookupKey != null) {
diff --git a/data/src/test/java/com/streamvault/data/epg/EpgResolutionEngineTest.kt b/data/src/test/java/com/streamvault/data/epg/EpgResolutionEngineTest.kt
index e3cc53a5..f88dc8bd 100644
--- a/data/src/test/java/com/streamvault/data/epg/EpgResolutionEngineTest.kt
+++ b/data/src/test/java/com/streamvault/data/epg/EpgResolutionEngineTest.kt
@@ -411,6 +411,57 @@ class EpgResolutionEngineTest {
assertThat(result["bbc1"]!![0].title).isEqualTo("News")
}
+ @Test
+ fun `getResolvedProgrammes_usesStreamIdWhenEpgIdsCollide`() = runTest {
+ val now = System.currentTimeMillis()
+ val startTime = now - 3600_000
+ val endTime = now + 3600_000
+ whenever(channelEpgMappingDao.getForChannels(PROVIDER_ID, listOf(1L, 2L))).thenReturn(
+ listOf(
+ ChannelEpgMappingEntity(
+ id = 1,
+ providerChannelId = 1,
+ providerId = PROVIDER_ID,
+ sourceType = EpgSourceType.EXTERNAL.name,
+ epgSourceId = SOURCE_1,
+ xmltvChannelId = "external.one",
+ matchType = EpgMatchType.MANUAL.name,
+ confidence = 1.0f,
+ updatedAt = now
+ ),
+ ChannelEpgMappingEntity(
+ id = 2,
+ providerChannelId = 2,
+ providerId = PROVIDER_ID,
+ sourceType = EpgSourceType.EXTERNAL.name,
+ epgSourceId = SOURCE_1,
+ xmltvChannelId = "external.two",
+ matchType = EpgMatchType.MANUAL.name,
+ confidence = 1.0f,
+ updatedAt = now
+ )
+ )
+ )
+ whenever(channelDao.getGuideLookupsByIds(listOf(1L, 2L))).thenReturn(
+ listOf(
+ makeGuideLookup(id = 1L, epgChannelId = "shared.epg", streamId = 101L),
+ makeGuideLookup(id = 2L, epgChannelId = "shared.epg", streamId = 202L)
+ )
+ )
+ whenever(epgProgrammeDao.getForChannels(SOURCE_1, listOf("external.one", "external.two"), startTime, endTime)).thenReturn(
+ listOf(
+ EpgProgrammeEntity(id = 1, epgSourceId = SOURCE_1, xmltvChannelId = "external.one", startTime = startTime, endTime = endTime, title = "One News"),
+ EpgProgrammeEntity(id = 2, epgSourceId = SOURCE_1, xmltvChannelId = "external.two", startTime = startTime, endTime = endTime, title = "Two News")
+ )
+ )
+
+ val result = engine.getResolvedProgrammes(PROVIDER_ID, listOf(1L, 2L), startTime, endTime)
+
+ assertThat(result.keys).containsExactly("101", "202")
+ assertThat(result["101"]!!.single().title).isEqualTo("One News")
+ assertThat(result["202"]!!.single().title).isEqualTo("Two News")
+ }
+
@Test
fun `getResolvedProgrammes_providerNative_returnsProgrammes`() = runTest {
val now = System.currentTimeMillis()
diff --git a/data/src/test/java/com/streamvault/data/repository/EpgRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/EpgRepositoryImplTest.kt
index 78b919cb..8ac386ba 100644
--- a/data/src/test/java/com/streamvault/data/repository/EpgRepositoryImplTest.kt
+++ b/data/src/test/java/com/streamvault/data/repository/EpgRepositoryImplTest.kt
@@ -118,12 +118,12 @@ class EpgRepositoryImplTest {
}
@Test
- fun `getResolvedProgramsForPlaybackChannel_prefersResolvedPrograms`() = runTest {
+ fun `getResolvedProgramsForPlaybackChannel_prefersResolvedProgramsByStreamId`() = runTest {
val resolvedPrograms = listOf(
Program(
id = 1L,
providerId = 7L,
- channelId = "bbc1.uk",
+ channelId = "42",
title = "Resolved News",
startTime = 100L,
endTime = 200L
@@ -136,7 +136,7 @@ class EpgRepositoryImplTest {
startTime = 0L,
endTime = 500L
)
- ).thenReturn(mapOf("bbc1.uk" to resolvedPrograms))
+ ).thenReturn(mapOf("42" to resolvedPrograms))
val repository = EpgRepositoryImpl(
programDao = programDao,
@@ -152,7 +152,7 @@ class EpgRepositoryImplTest {
providerId = 7L,
internalChannelId = 101L,
epgChannelId = "bbc1.uk",
- streamId = 0L,
+ streamId = 42L,
startTime = 0L,
endTime = 500L
)
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 829902e4..b5231477 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable product changes are recorded in this document.
- Improved reliability when configuring providers, importing settings, and preserving playback preferences.
- Improved Stalker EPG synchronization by increasing channel batch sizes from 500 to 5,000, reducing request overhead for large channel lineups while retaining bounded processing.
- Fixed native EPG resolution for large channel lineups by chunking program lookups to stay below SQLite bind-variable limits on older Android devices.
+- Fixed EPG collisions for channels sharing an EPG identifier by keying resolved guide data by the provider stream ID when available, while preserving legacy EPG-ID fallback queries.
- Reduced storage usage by limiting the shared HTTP cache to 16 MiB and pruning past EPG entries after 12 hours when a provider does not require a longer catch-up window.
- Added VOD category pinning for Movies and Series, with pin-first browsing, Android TV pin controls, and pinned category content shelves on the Home dashboard.
- Improved device orientation behavior by allowing portrait rotation on phones and tablets while keeping Android TV and Fire TV interfaces locked to landscape.
diff --git a/feature/live/src/main/java/com/streamvault/feature/live/epg/EpgViewModel.kt b/feature/live/src/main/java/com/streamvault/feature/live/epg/EpgViewModel.kt
index 971719a3..1eec9d9f 100644
--- a/feature/live/src/main/java/com/streamvault/feature/live/epg/EpgViewModel.kt
+++ b/feature/live/src/main/java/com/streamvault/feature/live/epg/EpgViewModel.kt
@@ -1692,10 +1692,21 @@ class EpgViewModel @Inject constructor(
key == null || resolvedPrograms[key].isNullOrEmpty()
}
val legacyPrograms: Map<String, List<Program>> = if (unresolvedChannels.isNotEmpty()) {
- val fallbackGuideKeys = unresolvedChannels.mapNotNull(Channel::guideLookupKey).distinct()
+ val fallbackProviderKeys = unresolvedChannels
+ .flatMap { channel -> channel.providerProgramLookupKeys() }
+ .distinct()
runCatching {
- if (fallbackGuideKeys.isEmpty()) emptyMap()
- else epgRepository.getProgramsForChannelsSnapshot(providerId, fallbackGuideKeys, windowStart, windowEnd)
+ if (fallbackProviderKeys.isEmpty()) {
+ emptyMap()
+ } else {
+ val providerPrograms = epgRepository.getProgramsForChannelsSnapshot(
+ providerId,
+ fallbackProviderKeys,
+ windowStart,
+ windowEnd
+ )
+ mapProviderProgramsByGuideKey(unresolvedChannels, providerPrograms)
+ }
}.getOrElse { emptyMap() }
} else {
emptyMap()
@@ -1921,8 +1932,12 @@ class EpgViewModel @Inject constructor(
endTime = baseSnapshot.guideWindowEnd,
categoryId = baseSnapshot.selectedCategoryId.takeIf { it >= 0L }
).first().groupBy { it.channelId }
+ val repositoryMatchedProgramsByGuideKey = mapProviderProgramsByGuideKey(
+ channels = scopedChannels,
+ programsByProviderKey = repositoryMatchedPrograms
+ )
- val repositoryMatchedLookupKeys = repositoryMatchedPrograms.keys
+ val repositoryMatchedLookupKeys = repositoryMatchedProgramsByGuideKey.keys
val matchedLookupKeys = buildList {
scopedChannels.forEach { channel ->
val lookupKey = channel.guideLookupKey() ?: return@forEach
@@ -1938,12 +1953,21 @@ class EpgViewModel @Inject constructor(
val missingMetadataPrograms = if (missingMetadataLookupKeys.isEmpty()) {
emptyMap()
} else {
- epgRepository.getProgramsForChannelsSnapshot(
- providerId = baseSnapshot.providerId,
- channelIds = missingMetadataLookupKeys,
- startTime = baseSnapshot.guideWindowStart,
- endTime = baseSnapshot.guideWindowEnd
- )
+ val missingMetadataChannels = missingMetadataLookupKeys.mapNotNull(scopedChannelsByLookup::get)
+ val providerKeys = missingMetadataChannels
+ .flatMap { channel -> channel.providerProgramLookupKeys() }
+ .distinct()
+ if (providerKeys.isEmpty()) {
+ emptyMap()
+ } else {
+ val providerPrograms = epgRepository.getProgramsForChannelsSnapshot(
+ providerId = baseSnapshot.providerId,
+ channelIds = providerKeys,
+ startTime = baseSnapshot.guideWindowStart,
+ endTime = baseSnapshot.guideWindowEnd
+ )
+ mapProviderProgramsByGuideKey(missingMetadataChannels, providerPrograms)
+ }
}
val matchedChannels = matchedLookupKeys.mapNotNull(scopedChannelsByLookup::get)
@@ -1953,12 +1977,28 @@ class EpgViewModel @Inject constructor(
?: missingMetadataPrograms[lookupKey]
?: emptyList()
} else {
- repositoryMatchedPrograms[lookupKey].orEmpty()
+ repositoryMatchedProgramsByGuideKey[lookupKey].orEmpty()
}
}
return matchedChannels to matchedPrograms
}
+ private fun Channel.providerProgramLookupKeys(): List<String> = buildList {
+ epgChannelId?.trim()?.takeIf { it.isNotEmpty() }?.let(::add)
+ streamId.takeIf { it > 0L }?.toString()?.let(::add)
+ }.distinct()
+
+ private fun mapProviderProgramsByGuideKey(
+ channels: List<Channel>,
+ programsByProviderKey: Map<String, List<Program>>
+ ): Map<String, List<Program>> = channels.mapNotNull { channel ->
+ val guideKey = channel.guideLookupKey() ?: return@mapNotNull null
+ val programs = channel.providerProgramLookupKeys()
+ .flatMap { providerKey -> programsByProviderKey[providerKey].orEmpty() }
+ .distinctBy { program -> Triple(program.id, program.startTime, program.endTime) }
+ if (programs.isEmpty()) null else guideKey to programs
+ }.toMap()
+
private suspend fun loadGuideSearchScopeChannels(baseSnapshot: GuideBaseSnapshot): List<Channel> {
val rawChannels = when {
baseSnapshot.showFavoritesOnly || baseSnapshot.selectedCategoryId < 0L -> baseSnapshot.allChannels
diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/model/GuideLookupKey.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/model/GuideLookupKey.kt
index ec6f289c..a597430c 100644
--- a/feature/live/src/main/java/com/streamvault/feature/live/presentation/model/GuideLookupKey.kt
+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/model/GuideLookupKey.kt
@@ -3,6 +3,6 @@ package com.streamvault.feature.live.presentation.model
import com.streamvault.domain.model.Channel
fun Channel.guideLookupKey(): String? {
- return epgChannelId?.trim()?.takeIf { it.isNotEmpty() }
- ?: streamId.takeIf { it > 0L }?.toString()
+ return streamId.takeIf { it > 0L }?.toString()
+ ?: epgChannelId?.trim()?.takeIf { it.isNotEmpty() }
}
diff --git a/feature/live/src/test/java/com/streamvault/feature/live/epg/EpgViewModelTest.kt b/feature/live/src/test/java/com/streamvault/feature/live/epg/EpgViewModelTest.kt
index 0290acd3..032c0932 100644
--- a/feature/live/src/test/java/com/streamvault/feature/live/epg/EpgViewModelTest.kt
+++ b/feature/live/src/test/java/com/streamvault/feature/live/epg/EpgViewModelTest.kt
@@ -220,7 +220,7 @@ class EpgViewModelTest {
)
val streamId = 101L
val channels = listOf(
- Channel(id = 1L, name = "One", providerId = provider.id, streamId = streamId)
+ Channel(id = 1L, name = "One", providerId = provider.id, epgChannelId = "native.one", streamId = streamId)
)
whenever(providerRepository.getActiveProvider()).thenReturn(flowOf(provider))
whenever(preferencesRepository.getHiddenCategoryIds(provider.id, ContentType.LIVE)).thenReturn(flowOf(emptySet()))
@@ -238,12 +238,12 @@ class EpgViewModelTest {
whenever(preferencesRepository.guideScheduledOnly).thenReturn(flowOf(false))
whenever(preferencesRepository.guideAnchorTime).thenReturn(flowOf(null))
whenever(epgRepository.getResolvedProgramsForChannels(eq(provider.id), any(), any(), any())).thenReturn(emptyMap())
- whenever(epgRepository.getProgramsForChannelsSnapshot(eq(provider.id), eq(listOf(streamId.toString())), any(), any())).thenReturn(
+ whenever(epgRepository.getProgramsForChannelsSnapshot(eq(provider.id), eq(listOf("native.one", streamId.toString())), any(), any())).thenReturn(
mapOf(
- streamId.toString() to listOf(
+ "native.one" to listOf(
Program(
id = 1L,
- channelId = streamId.toString(),
+ channelId = "native.one",
title = "Headline",
startTime = System.currentTimeMillis() - 60_000L,
endTime = System.currentTimeMillis() + 60_000L,
@@ -259,7 +259,7 @@ class EpgViewModelTest {
waitForUiState { viewModel.uiState.value.programsByChannel[streamId.toString()].orEmpty().isNotEmpty() }
assertThat(viewModel.uiState.value.programsByChannel.keys).containsExactly(streamId.toString())
- verify(epgRepository, atLeastOnce()).getProgramsForChannelsSnapshot(eq(provider.id), eq(listOf(streamId.toString())), any(), any())
+ verify(epgRepository, atLeastOnce()).getProgramsForChannelsSnapshot(eq(provider.id), eq(listOf("native.one", streamId.toString())), any(), any())
}
@Test
diff --git a/feature/live/src/test/java/com/streamvault/feature/live/presentation/model/GuideLookupKeyTest.kt b/feature/live/src/test/java/com/streamvault/feature/live/presentation/model/GuideLookupKeyTest.kt
index 7f0ca3e2..87f88af0 100644
--- a/feature/live/src/test/java/com/streamvault/feature/live/presentation/model/GuideLookupKeyTest.kt
+++ b/feature/live/src/test/java/com/streamvault/feature/live/presentation/model/GuideLookupKeyTest.kt
@@ -6,9 +6,9 @@ import org.junit.Test
class GuideLookupKeyTest {
@Test
- fun usesTrimmedEpgIdBeforeStreamId() {
+ fun usesPositiveStreamIdBeforeTrimmedEpgId() {
assertThat(Channel(1L, "One", epgChannelId = " epg.one ", streamId = 42L).guideLookupKey())
- .isEqualTo("epg.one")
+ .isEqualTo("42")
}
@Test
@@ -16,6 +16,12 @@ class GuideLookupKeyTest {
assertThat(Channel(1L, "One", streamId = 42L).guideLookupKey()).isEqualTo("42")
}
+ @Test
+ fun fallsBackToTrimmedEpgIdWhenStreamIdIsMissing() {
+ assertThat(Channel(1L, "One", epgChannelId = " epg.one ").guideLookupKey())
+ .isEqualTo("epg.one")
+ }
+
@Test
fun returnsNullWhenBothIdentifiersAreMissing() {
assertThat(Channel(1L, "One").guideLookupKey()).isNull()