Skip to content

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

fix(trakt): match discovery by TMDB id only

David Nashashf32a6c907d73
diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesViewModel.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesViewModel.kt
index e899eefe..caa5a94e 100644
--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesViewModel.kt
+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesViewModel.kt
@@ -60,7 +60,6 @@ import com.streamvault.feature.catalog.presentation.vod.setVodFavorite
import com.streamvault.feature.catalog.presentation.vod.updateVodGroupMembership
import com.streamvault.feature.catalog.presentation.vod.VodBrowseDefaults
import com.streamvault.feature.catalog.presentation.vod.orderedTraktDiscoveryItems
-import com.streamvault.feature.catalog.presentation.vod.traktDiscoveryCatalogYear
import com.streamvault.feature.catalog.presentation.dashboard.orderedWatchlistItems
import com.streamvault.domain.playback.isPlaybackComplete
import dagger.hilt.android.lifecycle.HiltViewModel
@@ -1380,13 +1379,9 @@ class MoviesViewModel @Inject constructor(
VodBrowseDefaults.TRAKT_POPULAR_MOVIES_CATEGORY -> {
val discoveryCategory = requireNotNull(VodBrowseDefaults.traktDiscoveryCategory(request.selectedCategory))
val discoveryItems = orderedTraktDiscoveryItems(
- entries = request.traktDiscoveryState.entries(discoveryCategory),
tmdbIds = request.traktDiscoveryState.items(discoveryCategory),
loadByTmdbIds = { ids -> movieRepository.getMoviesByTmdbIds(request.providerId, ids) },
- searchByTitle = { title -> movieRepository.searchMovies(request.providerId, title).first() },
tmdbIdOf = Movie::tmdbId,
- titleOf = Movie::name,
- yearOf = { movie -> traktDiscoveryCatalogYear(movie.year, movie.releaseDate, movie.name) },
idOf = Movie::id,
)
val filteredCatalogItems = discoveryItems
diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesViewModel.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesViewModel.kt
index 02d3e41d..ee04451d 100644
--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesViewModel.kt
+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesViewModel.kt
@@ -61,7 +61,6 @@ import com.streamvault.feature.catalog.presentation.vod.setVodFavorite
import com.streamvault.feature.catalog.presentation.vod.updateVodGroupMembership
import com.streamvault.feature.catalog.presentation.vod.VodBrowseDefaults
import com.streamvault.feature.catalog.presentation.vod.orderedTraktDiscoveryItems
-import com.streamvault.feature.catalog.presentation.vod.traktDiscoveryCatalogYear
import com.streamvault.feature.catalog.presentation.dashboard.orderedWatchlistItems
import dagger.hilt.android.lifecycle.HiltViewModel
import com.streamvault.feature.catalog.R
@@ -1374,13 +1373,9 @@ class SeriesViewModel @Inject constructor(
VodBrowseDefaults.TRAKT_POPULAR_SERIES_CATEGORY -> {
val discoveryCategory = requireNotNull(VodBrowseDefaults.traktDiscoveryCategory(request.selectedCategory))
val discoveryItems = orderedTraktDiscoveryItems(
- entries = request.traktDiscoveryState.entries(discoveryCategory),
tmdbIds = request.traktDiscoveryState.items(discoveryCategory),
loadByTmdbIds = { ids -> seriesRepository.getSeriesByTmdbIds(request.providerId, ids) },
- searchByTitle = { title -> seriesRepository.searchSeries(request.providerId, title).first() },
tmdbIdOf = Series::tmdbId,
- titleOf = Series::name,
- yearOf = { series -> traktDiscoveryCatalogYear(null, series.releaseDate, series.name) },
idOf = Series::id,
)
val filteredCatalogItems = discoveryItems
diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/TraktDiscoveryCatalogMatching.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/TraktDiscoveryCatalogMatching.kt
index 732ebdff..2202833d 100644
--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/TraktDiscoveryCatalogMatching.kt
+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/vod/TraktDiscoveryCatalogMatching.kt
@@ -1,101 +1,22 @@
package com.streamvault.feature.catalog.presentation.vod
-import com.streamvault.domain.trakt.TraktDiscoveryItem
-import java.text.Normalizer
-import java.util.Locale
-import kotlinx.coroutines.CancellationException
-
-/** Resolves Trakt-ranked titles to playable entries when provider records have no TMDB id. */
+/** Resolves Trakt-ranked TMDB IDs to matching playable entries in the active provider catalog. */
internal suspend fun <T> orderedTraktDiscoveryItems(
- entries: List<TraktDiscoveryItem>,
tmdbIds: List<Long>,
loadByTmdbIds: suspend (List<Long>) -> List<T>,
- searchByTitle: suspend (String) -> List<T>,
tmdbIdOf: (T) -> Long?,
- titleOf: (T) -> String,
- yearOf: (T) -> Int?,
idOf: (T) -> Long,
): List<T> {
- val rankedEntries = entries.ifEmpty {
- tmdbIds.map { TraktDiscoveryItem(tmdbId = it, title = "") }
- }
- val catalogItems = loadByTmdbIds(rankedEntries.mapNotNull(TraktDiscoveryItem::tmdbId))
- val catalogByTmdbId = catalogItems.groupBy(tmdbIdOf)
+ val rankedIds = tmdbIds.asSequence().filter { it > 0L }.distinct().toList()
+ if (rankedIds.isEmpty()) return emptyList()
+
+ val catalogByTmdbId = loadByTmdbIds(rankedIds).groupBy(tmdbIdOf)
val resolvedIds = HashSet<Long>()
return buildList {
- for (entry in rankedEntries) {
- val exactMatch = entry.tmdbId?.let(catalogByTmdbId::get)?.firstOrNull()
- val match = exactMatch ?: entry.title.takeIf(String::isNotBlank)?.let { title ->
- val candidates = try {
- searchByTitle(title)
- } catch (failure: CancellationException) {
- throw failure
- } catch (_: Exception) {
- emptyList()
- }
- findTraktTitleMatch(entry, candidates, titleOf, yearOf)
- }
+ for (tmdbId in rankedIds) {
+ val match = catalogByTmdbId[tmdbId]?.firstOrNull()
if (match != null && resolvedIds.add(idOf(match))) add(match)
}
}
}
-
-internal fun traktDiscoveryCatalogYear(year: String?, releaseDate: String?, title: String): Int? =
- year?.toIntOrNull()
- ?: releaseDate?.take(4)?.toIntOrNull()
- ?: TRAILING_YEAR_VALUE_REGEX.find(title)?.groupValues?.getOrNull(1)?.toIntOrNull()
-
-private fun <T> findTraktTitleMatch(
- entry: TraktDiscoveryItem,
- candidates: List<T>,
- titleOf: (T) -> String,
- yearOf: (T) -> Int?,
-): T? {
- val targetTitle = normalizeTraktTitle(entry.title)
- if (targetTitle.isBlank()) return null
- val titleMatches = candidates.filter { normalizeTraktTitle(titleOf(it)) == targetTitle }
- if (entry.year == null) return titleMatches.singleOrNull()
-
- val matchingYear = titleMatches.firstOrNull { yearOf(it) == entry.year }
- if (matchingYear != null) return matchingYear
-
- // Some providers omit the year. Accept a unique title match only when its year is unknown.
- return titleMatches.filter { yearOf(it) == null }.singleOrNull()
-}
-
-private fun normalizeTraktTitle(value: String): String {
- var title = value.trim()
- var prefixesRemoved = 0
- while (prefixesRemoved < MAX_PROVIDER_PREFIXES) {
- val prefix = PROVIDER_PREFIX_REGEX.find(title) ?: break
- val label = prefix.groupValues[1].lowercase(Locale.ROOT)
- if (label !in PROVIDER_PREFIXES) break
- title = prefix.groupValues[2]
- prefixesRemoved++
- }
- title = TRAILING_YEAR_REGEX.replace(title, " ")
- title = QUALITY_TAG_REGEX.replace(title, " ")
- val asciiFolded = Normalizer.normalize(title, Normalizer.Form.NFD)
- .replace(COMBINING_MARKS_REGEX, "")
- .lowercase(Locale.ROOT)
- return NON_ALPHANUMERIC_REGEX.replace(asciiFolded, "")
-}
-
-private const val MAX_PROVIDER_PREFIXES = 3
-private val PROVIDER_PREFIX_REGEX = Regex("""^([\p{L}]{2,12})\s+-\s+(.+)$""")
-private val PROVIDER_PREFIXES = setOf(
- "arabic", "bengali", "chinese", "english", "french", "german", "hindi", "indonesian",
- "italian", "japanese", "kannada", "korean", "malayalam", "marathi", "multi", "portuguese",
- "russian", "spanish", "tamil", "telugu", "thai", "turkish", "urdu",
- "ar", "bn", "zh", "en", "fr", "de", "hi", "id", "in", "it", "ja", "kn", "ko", "ml",
- "mr", "pt", "ru", "es", "ta", "te", "th", "tr", "ur",
-)
-private val TRAILING_YEAR_REGEX = Regex("""\s*(?:[-–—|·]\s*|\()((?:19|20)\d{2})\)?\s*$""")
-private val TRAILING_YEAR_VALUE_REGEX = Regex("""(?:[-–—|·(]\s*)((?:19|20)\d{2})\)?\s*$""")
-private val QUALITY_TAG_REGEX = Regex(
- """\b(?:8k|4320p|uhd|4k|2160p|2k|1440p|1080p|720p|576p|540p|480p|360p|hdr10?|hevc|h265|x265|multi[- ]audio|dual[- ]audio)\b""",
- RegexOption.IGNORE_CASE,
-)
-private val COMBINING_MARKS_REGEX = Regex("\\p{Mn}+")
-private val NON_ALPHANUMERIC_REGEX = Regex("[^\\p{L}\\p{N}]+")