From 3742888b11c4eea001edb146bbc857539270a83e Mon Sep 17 00:00:00 2001 From: RevGear <95308545+RevGear@users.noreply.github.com> Date: Fri, 27 Jan 2023 17:35:29 +0000 Subject: [PATCH] Update teliatv.ee Added website language (English / Estonian / Russian) to site id and use that to get data URL, rather than use channel language. Too many cases where the language in the URL didn't match the actual language of the returned data. Refreshed channel list --- sites/teliatv.ee/teliatv.ee.channels.xml | 677 +++++++++++------------ sites/teliatv.ee/teliatv.ee.config.js | 8 +- sites/teliatv.ee/teliatv.ee.test.js | 4 +- 3 files changed, 344 insertions(+), 345 deletions(-) diff --git a/sites/teliatv.ee/teliatv.ee.channels.xml b/sites/teliatv.ee/teliatv.ee.channels.xml index 2c437e7b..4c9dde1d 100644 --- a/sites/teliatv.ee/teliatv.ee.channels.xml +++ b/sites/teliatv.ee/teliatv.ee.channels.xml @@ -1,345 +1,342 @@ - ARTE Français - N-TV - RTL Deutschland - Sat. 1 Deutschland - 1+2 - Aljazeera English - Alo TV - Animal Planet - ARTE Français - BBC Earth Asia - BBC World News Europe - Bloomberg TV Europe - Boomerang - Canal 24 Horas - Cartoon Network - Club MTV - C Music TV - CNBC Europe - CNN International Europe - STS Baltic - Discovery Channel - Discovery Science - Disney Channel Scandinavia - Disney Junior Scandinavia - Dom Kino International - DTX - Duck TV SD - Duo 3 - Duo 4 - Duo 5 - Duo 6 - Dusk - DW English - Entusiast TV - Epic Drama - Eurochannel - EuroNews - Eurosport 1 - FashionTV - Fight Sports - Filmzone - Filmzone+ - Telekanal Futbol - Fox Life - Fox - France 24 - Pyatnitsa! - Fuel TV - History 2 - History - Hustler TV - Inspira - Investigation Discovery - Kanal 2 - Karusel - Kidzone+ - KidZone TV - KIKA - Lolo TV - MCM Top Russia - Mezzo - Mezzo Live HD - Moya Planeta - MTV 00s - MTV 80s - MTV 90s - MTV Global - MTV Hits Europe - MTV Live HD - MyHits - MyZen TV - National Geographic - National Geographic Wild - Nickelodeon - Nick Jr - Nicktoons - NTV Mir Baltic - NTV Serial - Okhota i Rybalka - Perviy Baltijskyi Kanal - Private TV - ProSieben - RBK TV - REN TV Baltic - RFM TV - RTR Planeta - Rossiya 24 - Setanta Sports 1 - Sky News International - Smartzone - Stingray Classica - Stingray Djazz - Stingray IConcerts - Super RTL Deutschland - Telecafé International - TLC Russia - TNT Comedy - Travel Channel Europe - TV 1000 Action - TV 1000 East - TV 1000 Russkoe Kino - TV 3 Film - TV 3 Plus - TV 3 Sport - TV 3 Sport 2 - TV Centr International - Dozhd - Usadba International - Viasat Explore - Viasat History - Viasat Nature East - VIP Comedy - Vremya - TVE Internacional Europa - 1+2 - Aljazeera English - Alo TV - Animal Planet - ARTE - BBC Earth - Bloomberg TV - Boomerang - Canal 24 Horas - Cartoon Network - Club MTV - C Music TV - CNBC Europe - CNN - STS Baltic - Discovery Channel - Discovery Science - Disney Channel - Disney Junior - Dom Kino - DTX - Duck TV - Duo 3 - Duo 4 - Duo 5 - Duo 6 - Duo 7 - Dusk - DW - Eesti Kanal - Entusiast TV - Epic Drama - ETV - ETV 2 - ETV + - Eurochannel - EuroNews Russkiy - Eurosport 1 - FashionTV - Fight Sports - Filmzone - Filmzone+ - Telekanal Futbol - Fox Life - Fox - France 2 - France 24 - Pyatnitsa! - Fuel TV - History 2 - History - Hustler TV - Inspira - Investigation Discovery - Kanal 2 - Karusel - Kidzone+ - KidZone TV - KIKA - Life TV - Lolo TV - MCM Top - Mezzo - Mezzo Live HD - Moya Planeta - MTV Global - MTV Hits - MTV Live HD - MyHits - MyZen TV - Nickelodeon - Nick Jr - Nicktoons - N-TV - NTV Mir Baltic - NTV Serial - Okhota i Rybalka - Orsent TV - Perviy Baltijskyi Kanal - Private TV - ProSieben - Rai 1 - RBK TV - REN TV - RFM TV - RTL - RTR Planeta - Rossiya 24 - Sat. 1 - Setanta Sports 1 - Sky News - Smartzone - Stingray Classica - Stingray Djazz - Stingray IConcerts - Super RTL - Taevas TV7 - TBN - Telecafé - TLC - TNT Comedy - Travel Channel - TV 1000 Action - TV 1000 - TV 1000 Russkoe Kino - TV 3 Eesti - TV 3 Film - TV 3 Plus - TV 3 Sport - TV 3 Sport 2 - TV5Monde - TV 6 Eesti - TV Centr - TVE - TVN - Dozhd - TV XXI - Usadba - Viasat Explore - Viasat History - Viasat Nature - VIP Comedy - Vremya - YLE TV 1 - YLE TV 2 - France 2 - TV5Monde Europe - Rai 1 - Disney Channel Scandinavia - 1+2 - Animal Planet Rossiya - Boomerang Central & Eastern Europe - Canal 24 Horas - Cartoon Network Russia & South East Europe - C Music TV - STS Baltic - Discovery Channel Rossiya - Discovery Science Rossiya - Dom Kino International - DTX Rossiya - Duck TV SD - Duo 3 - Duo 4 - Duo 5 - Duo 6 - Duo 7 - Eesti Kanal - Entusiast TV - Epic Drama - ETV - ETV 2 - ETV + - Eurochannel - EuroNews Russkiy - Eurosport 1 Rossiya - FashionTV Russia - Filmzone - Filmzone+ - Telekanal Futbol - Fox Life Russia - Fox Russia - France 2 - France 24 English - Pyatnitsa! International - Fuel TV - History 2 Asia - History Russia - Inspira - Investigation Discovery Rossiya - Kanal 2 - Karusel International - Kidzone+ - KidZone TV - KIKA - Life TV - Lolo TV - Mezzo - Mezzo Live HD - Moya Planeta - MyZen TV - National Geographic - National Geographic Wild - Nickelodeon CIS - Nick Jr Scandinavia - Nicktoons Scandinavia - N-TV - NTV Mir Baltic - NTV Serial - Okhota i Rybalka - Orsent TV - Perviy Baltijskyi Kanal - ProSieben Deutschland - Rai 1 - RBK TV - REN TV Baltic - RTR Planeta - Rossiya 24 - Setanta Sports 1 Evraziya - Smartzone - Super RTL Deutschland - TBN Baltia - Telecafé International - TLC Russia - TNT Comedy - Travel Channel Europe - TV 1000 Action - TV 1000 East - TV 1000 Russkoe Kino - TV 3 Eesti - TV 3 Film - TV 3 Plus - TV 3 Sport - TV 3 Sport 2 - TV5Monde Europe - TV 6 Eesti - TV Centr International - TVN - Dozhd - TV XXI - Usadba International - Viasat Explore - Viasat History - Viasat Nature East - VIP Comedy - Vremya - YLE TV 2 + Al Jazeera + + + ALO-TV + ALO-TV + + Animal Planet + Animal Planet + Animal Planet + Arte + Arte + Arte + BBC Earth + + + BBC World + + + Bloomberg TV + Bloomberg TV + + Boomerang + Boomerang + Boomerang + Cartoon Network + + Cartoon Network + MTV Club + + + CNBC Europe + CNBC Europe + + CNN International + + CNN International + + + Настоящее время + Discovery Channel + Discovery Channel + Discovery Channel + Discovery Science + Discovery Science + Discovery Science + Disney Channel + + + Disney Junior + + + DTX + DTX + DTX + Duo 3 + Duo 3 + Duo 3 + Duo 4 + Duo 4 + Duo 4 + + Duo 5 + Duo 5 + Duo 6 + Duo 6 + Duo 6 + + + Kanal 7 + Deutsche Welle + Deutsche Welle + Deutsche Welle + + Eesti Kanal + Eesti Kanal + Epic Drama + Epic Drama + Epic Drama + + ETV + ETV + + ETV 2 + ETV 2 + + ETV+ + ETV+ + Euronews + + Euronews + Euronews Rus + + Euronews Rus + Eurosport 1 + Eurosport 1 + Eurosport + Eurosport 2 + Eurosport 2 + Eurosport 2 + Fashion TV + + Fashion TV + Fight Sports + + + Filmzone + Filmzone + Filmzone + Filmzone+ + Filmzone+ + Filmzone+ + Fox Life + Fox Life + Fox Life + Fox + Fox + Fox + France 2 + + France 2 + France 24 + + France 24 + HGTV + HGTV + HGTV + HISTORY2 + + HISTORY2 + History Channel + History Channel + History Channel + Inspira + Inspira + Inspira + ID + ID + ID + + Kanal 2 + Kanal 2 + Kidzone Mini + Kidzone Mini + Kidzone Mini + Kidzone + Kidzone + Kidzone + + LIFE TV + LIFE TV + MCM TOP + MCM TOP + + Mezzo + Mezzo + Mezzo + Mezzo Live HD + Mezzo Live HD + Mezzo Live HD + MTV 00s + + + MTV 80s + + + MTV 90s + + + MTV Europe + + + MTV Hits + + + MTV Live HD + + + MyHits + MyHits + + National Geographic + National Geographic + National Geographic + Nat Geo Wild + + Nat Geo Wild + + + НЕБЕСА ТВ7 + Nickelodeon + Nickelodeon + Nickelodeon + nick Jr. + nick Jr. + nick Jr. + nicktoons + nicktoons + nicktoons + n-tv + n-tv + n-tv + + + Orsent TV + PRO 7 + PRO 7 + PRO 7 + RAI 1 + + RAI 1 + RFM TV + RFM TV + + RTL + RTL + + RTL2 + + + SAT 1 + SAT 1 + SAT 1 + Setanta Sports + Setanta Sports + Setanta Sports + SKY News + + + Smartzone + Smartzone + Smartzone + Classica + + + DJAZZ.tv + + + iConcerts + + + Super RTL + Super RTL + Super RTL + SVT1 + + + SVT2 + + + + TAEVAS TV7 + + + + TBN Baltia + TLC + TLC + TLC + Travel Channel + Travel Channel + Travel Channel + TV1000 Action + TV1000 Action + TV1000 Action + TV1000 East + TV1000 East + TV1000 East + TV1000 World Kino + TV1000 World Kino + TV1000 World Kino + + TV3 + TV3 + TV3 Film + TV3 Film + TV3 Film + TV3 Life + TV3 Life + TV3 Life + + 3+ + 3+ + TV3 Sport + + TV3 Sport + TV3 Sport2 + + TV3 Sport2 + TV5MONDE Europe + + TV5MONDE Europe + + TV6 + TV6 + TVEi + + + + + TVN + + TVXXI + TVXXI + + + Украина 24 + Viasat Explore + Viasat Explore + Viasat Explore + Viasat History + Viasat History + Viasat History + Viasat Nature + Viasat Nature + Viasat Nature + VIP Comedy + VIP Comedy + VIP Comedy + YLE TV1 + YLE TV1 + YLE TV1 + YLE TV2 + YLE TV2 + YLE TV2 + ZDF + + ZDF + + + + + + + + + + diff --git a/sites/teliatv.ee/teliatv.ee.config.js b/sites/teliatv.ee/teliatv.ee.config.js index 2f1569f2..2e87f4d8 100644 --- a/sites/teliatv.ee/teliatv.ee.config.js +++ b/sites/teliatv.ee/teliatv.ee.config.js @@ -5,8 +5,9 @@ module.exports = { site: 'teliatv.ee', days: 2, url({ date, channel }) { - return `https://api.teliatv.ee/dtv-api/3.2/${channel.lang}/epg/guide?channelIds=${ - channel.site_id + const [lang, channelId] = channel.site_id.split('#') + return `https://api.teliatv.ee/dtv-api/3.2/${lang}/epg/guide?channelIds=${ + channelId }&relations=programmes&images=webGuideItemLarge&startAt=${date .add(1, 'd') .format('YYYY-MM-DDTHH:mm')}&startAtOp=lte&endAt=${date.format( @@ -52,7 +53,8 @@ function parseIcon(item) { function parseItems(content, channel) { const data = JSON.parse(content) if (!data || !data.relations || !data.categoryItems) return [] - const items = data.categoryItems[channel.site_id] || [] + const [, channelId] = channel.site_id.split('#') + const items = data.categoryItems[channelId] || [] return items .map(i => { diff --git a/sites/teliatv.ee/teliatv.ee.test.js b/sites/teliatv.ee/teliatv.ee.test.js index 85f5d08f..29ab9ac4 100644 --- a/sites/teliatv.ee/teliatv.ee.test.js +++ b/sites/teliatv.ee/teliatv.ee.test.js @@ -11,7 +11,7 @@ dayjs.extend(utc) const date = dayjs.utc('2021-11-20', 'YYYY-MM-DD').startOf('d') const channel = { lang: 'et', - site_id: '1', + site_id: 'et#1', xmltv_id: 'ETV.ee' } @@ -24,7 +24,7 @@ it('can generate valid url', () => { it('can generate valid url with different language', () => { const ruChannel = { lang: 'ru', - site_id: '1', + site_id: 'ru#1', xmltv_id: 'ETV.ee' } expect(url({ date, channel: ruChannel })).toBe(