StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
feat(sports): recognize Brazilian Portuguese EPG listings
MathFonsd94c767c0779
diff --git a/feature/live/src/main/java/com/streamvault/feature/live/sports/SportsEventParser.kt b/feature/live/src/main/java/com/streamvault/feature/live/sports/SportsEventParser.ktindex 0edd68a1..f085f6c8 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/sports/SportsEventParser.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/sports/SportsEventParser.kt@@ -23,7 +23,9 @@ internal object SportsEventParser {"""serie\s+a|bundesliga|ligue\s+1|fa\s+cup|europa\s+league|eredivisie|""" +"""primeira\s+liga|copa\s+del\s+rey|copa\s+libertadores|copa\s+america|""" +"""nations\s+league|carabao\s+cup|efl\s+cup|saudi\s+pro\s+league|""" +- """liga\s+mx|scottish\s+premiership|spfl\s+premiership)\b""",+ """liga\s+mx|scottish\s+premiership|spfl\s+premiership|""" ++ """brasileirao|copa\s+do\s+brasil|libertadores|sul\s+americana|sulamericana|sudamericana|""" ++ """rodada|quartas\s+de\s+final|oitavas\s+de\s+final)\b""",RegexOption.IGNORE_CASE,)private val qualitySuffixPattern = Regex(@@ -41,6 +43,19 @@ internal object SportsEventParser {"\\b(?:live|hd|fhd|uhd|4k|8k|football|soccer|basketball|match|game)\\b",)private val whitespacePattern = Regex("\\s+")++ // Brazilian guides decorate fixtures with airing notes rather than competitor names:+ // "VT - A x B", "Dia 24/10 - A x B", "Hoje a partir das 18:30 - A x B", "A x B - Ao Vivo".+ private val replayTitlePrefixPattern = Regex("""^\s*vt\s*[-–—:]\s*""", RegexOption.IGNORE_CASE)+ private val announcementTitlePrefixPattern = Regex(+ """^\s*(?:dia\s+\d{1,2}/\d{1,2}(?:/\d{2,4})?|""" ++ """hoje\s+(?:a\s+partir\s+d[ao]s|[àa]s?)\s+\d{1,2}(?:[:h]\d{2})?h?)\s*[-–—:]\s*""",+ RegexOption.IGNORE_CASE,+ )+ private val airingNoteSuffixPattern = Regex(+ """(?:\s+[-–—]\s+(?:ao\s+vivo|narra[çc][ãa]o|reprise|compacto|vt))+\s*$""",+ RegexOption.IGNORE_CASE,+ )private val hyphenatedYearPattern = Regex("\\b(?:19|20)\\d{2}(?:\\s*[-/]\\s*(?:\\d{2}|20\\d{2}))?\\b")private val numericOnlyPattern = Regex("^\\d+$")private val explicitHeaderPrefixes = setOf(@@ -48,11 +63,12 @@ internal object SportsEventParser {)private val replayPattern = Regex(- """\b(?:replay|re-run|rerun|repeat|encore|classic\s+match)\b""",+ """\b(?:replay|re-run|rerun|repeat|encore|classic\s+match|reprise|reapresenta[çc][ãa]o)\b|""" ++ """^\s*vt\s*[-–—:]""",RegexOption.IGNORE_CASE,)private val highlightsPattern = Regex(- """\b(?:highlights?|best\s+of)\b""",+ """\b(?:highlights?|best\s+of|melhores\s+momentos|compacto)\b""",RegexOption.IGNORE_CASE,)private val previewPattern = Regex("\\bpreview\\b", RegexOption.IGNORE_CASE)@@ -65,7 +81,7 @@ internal object SportsEventParser {"""evening\s+edition|sur\s+canal|talk\s*show|documentary)\b""",RegexOption.IGNORE_CASE,)- private val explicitLivePattern = Regex("\\blive\\b", RegexOption.IGNORE_CASE)+ private val explicitLivePattern = Regex("\\blive\\b|\\bao\\s+vivo\\b", RegexOption.IGNORE_CASE)private val sprintQualifyingPattern = Regex("\\bsprint\\s+qualifying\\b", RegexOption.IGNORE_CASE)private val practiceNumberPattern = Regex("\\b(?:fp|practice\\s*)([1-3])\\b", RegexOption.IGNORE_CASE)@@ -80,7 +96,8 @@ internal object SportsEventParser {private val numberedDayPattern = Regex("\\bday\\s*(\\d+)\\b", RegexOption.IGNORE_CASE)private val etapaSessionPattern = Regex("\\betapa\\s*(\\d+)\\b", RegexOption.IGNORE_CASE)- fun extractMatchup(title: String): Pair<String, String>? {+ fun extractMatchup(rawTitle: String): Pair<String, String>? {+ val title = stripAiringDecorations(rawTitle)val explicitMatch = matchupPattern.find(title)if (explicitMatch != null) {val first = cleanCompetitorName(explicitMatch.groupValues[1].substringAfterLast(':').trim())@@ -137,7 +154,8 @@ internal object SportsEventParser {signals.any(highlightsPattern::containsMatchIn) -> SportsEventType.HIGHLIGHTSsignals.any(preGamePattern::containsMatchIn) -> SportsEventType.PRE_GAMEsignals.any(postGamePattern::containsMatchIn) -> SportsEventType.POST_GAME- signals.any(previewPattern::containsMatchIn) -> SportsEventType.PREVIEW+ signals.any(previewPattern::containsMatchIn) ||+ announcementTitlePrefixPattern.containsMatchIn(title) -> SportsEventType.PREVIEWsignals.any(sportsNewsPattern::containsMatchIn) -> SportsEventType.SPORTS_NEWSsignals.any(sportsShowPattern::containsMatchIn) -> SportsEventType.SPORTS_SHOWhasCompetitiveSignal && explicitLivePattern.containsMatchIn(title) -> SportsEventType.LIVE_EVENT@@ -248,6 +266,15 @@ internal object SportsEventParser {private fun containsPhrase(value: String, phrase: String): Boolean = " $value ".contains(" $phrase ")+ private fun stripAiringDecorations(title: String): String {+ val stripped = title+ .replace(announcementTitlePrefixPattern, "")+ .replace(replayTitlePrefixPattern, "")+ .replace(airingNoteSuffixPattern, "")+ .trim()+ return stripped.ifBlank { title }+ }+private fun cleanCompetitorName(value: String): String = value.let(::stripCompetitionHeader).replace(competitorPrefixPattern, "")diff --git a/feature/live/src/main/java/com/streamvault/feature/live/sports/SportsMetadataRegistry.kt b/feature/live/src/main/java/com/streamvault/feature/live/sports/SportsMetadataRegistry.ktindex 2d8c9e48..7b6775a6 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/sports/SportsMetadataRegistry.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/sports/SportsMetadataRegistry.kt@@ -105,6 +105,34 @@ internal object SportsLeagueRegistry {Definition("Premier League", SportType.FOOTBALL, listOf("Premier League", "English Premier League", "EPL")),Definition("La Liga", SportType.FOOTBALL, listOf("La Liga", "LaLiga")),Definition("Serie A", SportType.FOOTBALL, listOf("Serie A")),+ // Série B precedes Série A: equal longest aliases keep list order, and Série A owns the bare "Brasileirão".+ Definition(+ "Brasileirão Série B",+ SportType.FOOTBALL,+ listOf(+ "Brasileirão Série B", "Campeonato Brasileiro Série B", "Série B do Brasileirão",+ "Série B do futebol masculino brasileiro",+ ),+ ),+ Definition(+ "Brasileirão Série A",+ SportType.FOOTBALL,+ listOf(+ "Brasileirão Série A", "Brasileirão", "Campeonato Brasileiro Série A",+ "Série A do Brasileirão", "Série A do futebol masculino brasileiro",+ ),+ ),+ Definition("Copa do Brasil", SportType.FOOTBALL, listOf("Copa do Brasil")),+ Definition(+ "Copa Libertadores",+ SportType.FOOTBALL,+ listOf("Copa Libertadores", "CONMEBOL Libertadores", "Libertadores"),+ ),+ Definition(+ "Copa Sul-Americana",+ SportType.FOOTBALL,+ listOf("Copa Sul-Americana", "Sul-Americana", "Sulamericana", "Copa Sudamericana", "CONMEBOL Sudamericana"),+ ),Definition("Bundesliga", SportType.FOOTBALL, listOf("Bundesliga", "1 Bundesliga")),Definition("Ligue 1", SportType.FOOTBALL, listOf("Ligue 1")),Definition("FA Cup", SportType.FOOTBALL, listOf("FA Cup")),diff --git a/feature/live/src/main/java/com/streamvault/feature/live/sports/SportsProgrammeClassifier.kt b/feature/live/src/main/java/com/streamvault/feature/live/sports/SportsProgrammeClassifier.ktindex 65634485..5e54acb8 100644--- a/feature/live/src/main/java/com/streamvault/feature/live/sports/SportsProgrammeClassifier.kt+++ b/feature/live/src/main/java/com/streamvault/feature/live/sports/SportsProgrammeClassifier.kt@@ -8,14 +8,18 @@ internal object SportsProgrammeClassifier {"""\b(?:qualifying|practice|race|championship|tournament|round|fight\s+night|main\s+card|""" +"""stage|playoffs?|grand\s+prix|world\s+series|finals?|semi[ -]?finals?|quarter[ -]?finals?|""" +"""matchday|md\s*\d+|week\s+\d+|day\s+\d+|qf\s*\d+|open|asian\s+games|""" +- """friday\s+fights|pro\s+portugal)\b|\bpremier\s+padel\b.*\bp[1-4]\b""",+ """friday\s+fights|pro\s+portugal|""" ++ """etapa|treino|corrida|quartas\s+de\s+final|oitavas\s+de\s+final)\b|""" ++ """\bpremier\s+padel\b.*\bp[1-4]\b""",RegexOption.IGNORE_CASE,)private val tennisTourIdPattern = Regex("\\batp\\s*\\d{3,4}\\b", RegexOption.IGNORE_CASE)private val genericCategoryNames = setOf("sport", "sports", "live tv", "tv")private val sportsTerms = mapOf(- SportType.AMERICAN_FOOTBALL to listOf("american football", "gridiron", "nfl"),+ SportType.AMERICAN_FOOTBALL to listOf(+ "american football", "gridiron", "nfl", "national football league", "futebol americano",+ ),SportType.FOOTBALL to listOf("football", "soccer", "futbol", "fútbol", "futebol", "fußball", "fussball", "fudbal","رياضة كرة القدم", "كرة القدم", "premier league", "champions league", "la liga",@@ -23,19 +27,25 @@ internal object SportsProgrammeClassifier {"eredivisie", "primeira liga", "copa del rey", "copa libertadores", "copa america","uefa nations league", "carabao cup", "efl cup", "saudi pro league","roshn saudi league", "liga mx", "scottish premiership", "spfl premiership",+ "brasileirao", "copa do brasil", "libertadores", "sul americana", "sulamericana", "sudamericana",+ ),+ SportType.BASKETBALL to listOf(+ "basketball", "basket-ball", "nba", "wnba", "euroleague", "basquete", "basquetebol",),- SportType.BASKETBALL to listOf("basketball", "basket-ball", "nba", "wnba", "euroleague"),SportType.BASEBALL to listOf("baseball", "mlb"),- SportType.HOCKEY to listOf("ice hockey", "hockey", "nhl"),+ SportType.HOCKEY to listOf("ice hockey", "hockey", "nhl", "hoquei"),SportType.TENNIS to listOf("tennis", "tenis", "atp", "wta", "grand slam"),- SportType.MOTORSPORT to listOf("motorsport", "formula 1", "formula one", "f1", "grand prix", "nascar", "motogp", "rally"),+ SportType.MOTORSPORT to listOf(+ "motorsport", "formula 1", "formula one", "f1", "grand prix", "nascar", "motogp", "rally",+ "automobilismo", "stock car",+ ),SportType.MMA to listOf("mma", "ufc", "mixed martial arts", "one friday fights"),SportType.BOXING to listOf("boxing", "boxeo", "boxe"),SportType.CRICKET to listOf("cricket", "ipl"),SportType.RUGBY to listOf("rugby"),SportType.GOLF to listOf("golf", "pga tour", "lpga"),- SportType.VOLLEYBALL to listOf("volleyball", "volleball"),- SportType.HANDBALL to listOf("handball"),+ SportType.VOLLEYBALL to listOf("volleyball", "volleball", "volei", "voleibol"),+ SportType.HANDBALL to listOf("handball", "handebol"),SportType.SNOOKER to listOf("snooker"),SportType.DARTS to listOf("darts"),SportType.CYCLING to listOf("cycling", "cyclisme", "ciclismo", "tour de france"),@@ -46,6 +56,7 @@ internal object SportsProgrammeClassifier {"espn", "bein sports", "sky sports", "supersport", "sportsnet", "fox sports","tnt sports", "dazn", "arena sport", "canal+ sport", "eurosport", "tennis channel","golf channel", "nfl network", "nba tv", "mlb network", "nhl network",+ "sportv", "bandsports", "premiere clubes",)private val normalizedSportsTerms = sportsTerms.mapValues { (_, terms) ->terms.map { " " + normalizeText(it) + " " }diff --git a/feature/live/src/test/java/com/streamvault/feature/live/sports/SportsMetadataRegistryTest.kt b/feature/live/src/test/java/com/streamvault/feature/live/sports/SportsMetadataRegistryTest.ktindex b5123a14..c89fceaf 100644--- a/feature/live/src/test/java/com/streamvault/feature/live/sports/SportsMetadataRegistryTest.kt+++ b/feature/live/src/test/java/com/streamvault/feature/live/sports/SportsMetadataRegistryTest.kt@@ -68,4 +68,22 @@ class SportsMetadataRegistryTest {assertThat(SportsLeagueRegistry.detect("EPL")?.id).isEqualTo(SportsLeagueRegistry.detect("Premier League")?.id)}++ @Test+ fun detectsBrazilianCompetitionsBeforeShorterEuropeanAliases() {+ assertThat(SportsLeagueRegistry.detect("Brasileirão Série A")?.displayName)+ .isEqualTo("Brasileirão Série A")+ assertThat(SportsLeagueRegistry.detect("a Série A do futebol masculino brasileiro")?.displayName)+ .isEqualTo("Brasileirão Série A")+ assertThat(SportsLeagueRegistry.detect("Campeonato Brasileiro, Série B")?.displayName)+ .isEqualTo("Brasileirão Série B")+ assertThat(SportsLeagueRegistry.detect("Brasileirão Série B")?.displayName)+ .isEqualTo("Brasileirão Série B")+ assertThat(SportsLeagueRegistry.detect("Semifinal da Libertadores")?.displayName)+ .isEqualTo("Copa Libertadores")+ assertThat(SportsLeagueRegistry.detect("Copa Sul-Americana")?.displayName)+ .isEqualTo("Copa Sul-Americana")+ assertThat(SportsLeagueRegistry.detect("Serie A, primeira divisão da Itália")?.displayName)+ .isEqualTo("Serie A")+ }}diff --git a/feature/live/src/test/java/com/streamvault/feature/live/sports/SportsProgrammeClassifierTest.kt b/feature/live/src/test/java/com/streamvault/feature/live/sports/SportsProgrammeClassifierTest.ktindex 70e13c7e..9f09ba78 100644--- a/feature/live/src/test/java/com/streamvault/feature/live/sports/SportsProgrammeClassifierTest.kt+++ b/feature/live/src/test/java/com/streamvault/feature/live/sports/SportsProgrammeClassifierTest.kt@@ -269,6 +269,98 @@ class SportsProgrammeClassifierTest {)}+ @Test+ fun `brazilian guides use x matchups and portuguese sport descriptions`() {+ val brasileirao = classify(+ title = "Vasco x Corinthians - Ao Vivo",+ description = "Vasco e Corinthians jogam pela 32ª rodada do Segundo Turno do Brasileirão.",+ channel = channel("PREMIERE 2 [FHD]"),+ )+ assertThat(brasileirao.isSports).isTrue()+ assertThat(brasileirao.isCompetitiveEvent).isTrue()+ assertThat(brasileirao.eventType).isEqualTo(SportsEventType.LIVE_EVENT)+ assertThat(brasileirao.sport).isEqualTo(SportType.FOOTBALL)+ assertThat(brasileirao.league).isEqualTo("Brasileirão Série A")+ assertThat(brasileirao.competitors).containsExactly("Vasco", "Corinthians").inOrder()++ val volei = classify(+ title = "Sesi Bauru x Mackenzie",+ description = "Todas as emoções da principal competição de vôlei feminino entre equipes brasileiras.",+ channel = channel("SPORTV 2 [FHD]"),+ )+ assertThat(volei.isCompetitiveEvent).isTrue()+ assertThat(volei.sport).isEqualTo(SportType.VOLLEYBALL)++ val nba = classify(+ title = "Los Angeles Lakers x Golden State Warriors",+ description = "Trinta equipes se enfrentam na principal liga de basquete do mundo.",+ channel = channel("ESPN 2 [FHD]"),+ )+ assertThat(nba.sport).isEqualTo(SportType.BASKETBALL)++ val nfl = classify(+ title = "San Francisco 49ers x Washington Commanders",+ description = "Todas as emoções da National Football League, a liga profissional de futebol americano.",+ channel = channel("ESPN 2 [FHD]"),+ )+ assertThat(nfl.sport).isEqualTo(SportType.AMERICAN_FOOTBALL)+ }++ @Test+ fun `brazilian sports channel names are recognized without guide text`() {+ val event = classify(title = "Botafogo x Palmeiras", channel = channel("SPORTV [FHD]"))++ assertThat(event.isSports).isTrue()+ assertThat(event.isCompetitiveEvent).isTrue()+ assertThat(event.competitors).containsExactly("Botafogo", "Palmeiras").inOrder()+ }++ @Test+ fun `brazilian airing notes are stripped from competitors and classified`() {+ val replay = classify(+ title = "VT - Grêmio x Internacional",+ description = "Aqui no Brasileirão tem os melhores jogos!",+ channel = channel("PREMIERE CLUBES [FHD]"),+ )+ assertThat(replay.eventType).isEqualTo(SportsEventType.REPLAY)+ assertThat(replay.isCompetitiveEvent).isFalse()+ assertThat(replay.competitors).containsExactly("Grêmio", "Internacional").inOrder()++ val announcement = classify(+ title = "Hoje a partir das 18:30 - Vasco x Corinthians",+ description = "Vasco e Corinthians jogam pela 32ª rodada do Brasileirão.",+ channel = channel("PREMIERE 2 [FHD]"),+ )+ assertThat(announcement.eventType).isEqualTo(SportsEventType.PREVIEW)+ assertThat(announcement.isCompetitiveEvent).isFalse()+ assertThat(announcement.competitors).containsExactly("Vasco", "Corinthians").inOrder()++ val datedAnnouncement = classify(+ title = "Dia 24/10 - São Bernardo FC x Vila Nova",+ description = "Jogo pela 34ª rodada do Campeonato Brasileiro, Série B.",+ channel = channel("PREMIERE 7 [FHD]"),+ )+ assertThat(datedAnnouncement.eventType).isEqualTo(SportsEventType.PREVIEW)+ assertThat(datedAnnouncement.league).isEqualTo("Brasileirão Série B")+ assertThat(datedAnnouncement.competitors).containsExactly("São Bernardo FC", "Vila Nova").inOrder()++ val narrated = classify(+ title = "Libertadores Feminina - Olimpia x Cruzeiro - Narração - Ao Vivo",+ channel = channel("CANAL UOL [FHD]"),+ )+ assertThat(narrated.eventType).isEqualTo(SportsEventType.LIVE_EVENT)+ assertThat(narrated.league).isEqualTo("Copa Libertadores")+ assertThat(narrated.competitors).containsExactly("Olimpia", "Cruzeiro").inOrder()+ }++ @Test+ fun `portuguese live talk shows are not hyphen matchups`() {+ val show = classify(title = "Posse de Bola - Ao Vivo", channel = channel("CANAL UOL [FHD]"))++ assertThat(show.competitors).isEmpty()+ assertThat(show.isCompetitiveEvent).isFalse()+ }+private fun classify(title: String,description: String = "",