From 636d5290b65b9dcc9caa3f9bfcb54fd6615152ff Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 1 Feb 2022 04:04:51 +0300 Subject: [PATCH 1/6] Update allente.se.config.js --- sites/allente.se/allente.se.config.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sites/allente.se/allente.se.config.js b/sites/allente.se/allente.se.config.js index 0cc8a044..816e3f58 100644 --- a/sites/allente.se/allente.se.config.js +++ b/sites/allente.se/allente.se.config.js @@ -8,9 +8,6 @@ module.exports = { return `https://cs-vcb.allente.${country}/epg/events?date=${date.format('YYYY-MM-DD')}` }, - logo({ channel }) { - return channel.logo - }, parser({ content, channel }) { let programs = [] const items = parseItems(content, channel) @@ -40,8 +37,7 @@ module.exports = { return { lang, site_id: `${country}#${item.id}`, - name: item.name, - logo: `https:${item.icon}` + name: item.name } }) } From b12c45c6e9c9bb6e2d299fdac536828961c6fade Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 1 Feb 2022 04:04:54 +0300 Subject: [PATCH 2/6] Update allente.se.test.js --- sites/allente.se/allente.se.test.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sites/allente.se/allente.se.test.js b/sites/allente.se/allente.se.test.js index 01ed9b19..5a5d4d03 100644 --- a/sites/allente.se/allente.se.test.js +++ b/sites/allente.se/allente.se.test.js @@ -4,7 +4,7 @@ // node ./scripts/channels.js --config=./sites/allente.se/allente.se.config.js --output=./sites/allente.se/allente.se_dk.channels.xml --set=country:dk --set=lang:da // npx epg-grabber --config=sites/allente.se/allente.se.config.js --channels=sites/allente.se/allente.se_se.channels.xml --output=.gh-pages/guides/se/allente.se.epg.xml --days=2 -const { parser, url, logo } = require('./allente.se.config.js') +const { parser, url } = require('./allente.se.config.js') const dayjs = require('dayjs') const utc = require('dayjs/plugin/utc') const customParseFormat = require('dayjs/plugin/customParseFormat') @@ -14,8 +14,7 @@ dayjs.extend(utc) const date = dayjs.utc('2021-11-17', 'YYYY-MM-DD').startOf('d') const channel = { site_id: 'se#0148', - xmltv_id: 'SVT1.se', - logo: 'https://images.ctfassets.net/989y85n5kcxs/5uT9g9pdQWRZeDPQXVI9g6/e02f550a32e259b9be8081e83dc64948/svt_1_logotyp_rgb_0.png' + xmltv_id: 'SVT1.se' } it('can generate valid url', () => { @@ -29,12 +28,6 @@ it('can generate valid url for different country', () => { ) }) -it('can generate valid logo url', () => { - expect(logo({ channel })).toBe( - 'https://images.ctfassets.net/989y85n5kcxs/5uT9g9pdQWRZeDPQXVI9g6/e02f550a32e259b9be8081e83dc64948/svt_1_logotyp_rgb_0.png' - ) -}) - it('can parse response', () => { const content = `{"channels":[{"id":"0148","icon":"//images.ctfassets.net/989y85n5kcxs/5uT9g9pdQWRZeDPQXVI9g6/e02f550a32e259b9be8081e83dc64948/svt_1_logotyp_rgb_0.png","name":"SVT1 HD (T)","events":[{"id":"0086202111170415","live":false,"time":"2021-11-17T04:15:00Z","title":"Go'kväll","details":{"title":"Go'kväll","image":"https://viasatps.api.comspace.se/PS/channeldate/image/viasat.ps/21/2021-11-16/se.cs.svt1.event.A_40938191100.jpg?size=2560x1440","description":"Svenskt magasin från 2021. Dockspelare och hundar. Intervju med dockspelarna Björn Carlberg och Petter Lennstrand, personerna bakom tv-favoriter som Allram Eest och Klotty. Nu är de aktuella med turné och en ny dockföreställning. Sofia Åhman ger nya inspirerande träningstips och hundinstruktören Helena Tilly svarar på tittarnas frågor om hundar. Reportageserien \\"Sju sorters kakor\\" fortsätter.","season":2021,"episode":121,"categories":["other"],"duration":"45"}}]}]}` const result = parser({ content, channel }).map(p => { From f2eff659666f93a3d63afbc533e604b2ce2cd370 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 1 Feb 2022 04:04:58 +0300 Subject: [PATCH 3/6] Update allente.se_dk.channels.xml --- sites/allente.se/allente.se_dk.channels.xml | 122 ++++++++++---------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/sites/allente.se/allente.se_dk.channels.xml b/sites/allente.se/allente.se_dk.channels.xml index 663bdd0f..e07cde9d 100644 --- a/sites/allente.se/allente.se_dk.channels.xml +++ b/sites/allente.se/allente.se_dk.channels.xml @@ -1,66 +1,66 @@ - 6'eren - Aljazeera English - BBC World News Europe - Boomerang Nordic - Canal 9 - Cartoon Network Nordic - C More First - C More Hits - C More Series - C More Stars - CNBC Europe - CNN International Europe - Disney Channel Scandinavia - Disney Junior Scandinavia - DK 4 - DR 1 - DR 2 - DR Ramasjang - E! Europe - EuroNews English - Eurosport 2 Danmark - God TV Scandinavia - Kanal 4 - Kanal 5 - MTV 00s - MTV 80s - MTV Hits Europe - MTV Nordic - National Geographic Channel HD Europe - National Geographic Danmark - National Geographic Wild Europe - Nickelodeon Danmark - Nick Jr Scandinavia - Nicktoons Scandinavia - NRK1 - Paramount Network Danmark - SF-kanalen - Sky News International - SVT 1 - TV 2 - TV 2 Charlie - TV 2 Fri - TV 2 News - TV 2 Sport - TV 2 Zulu - TV 3 Danmark - TV 3 Max - TV 3 Puls - TV 3 Sport - TV 4 - V Film Action - V Film Family - V Film Hits - V Film Premiere - Viasat Explore - Viasat History HD - Viasat Nature - V Series - V Sport Golf - V Sport Ultra HD - Xee + 6'eren + Aljazeera English + BBC World News Europe + Boomerang Nordic + Canal 9 + Cartoon Network Nordic + C More First + C More Hits + C More Series + C More Stars + CNBC Europe + CNN International Europe + Disney Channel Scandinavia + Disney Junior Scandinavia + DK 4 + DR 1 + DR 2 + DR Ramasjang + E! Europe + EuroNews English + Eurosport 2 Danmark + God TV Scandinavia + Kanal 4 + Kanal 5 + MTV 00s + MTV 80s + MTV Hits Europe + MTV Nordic + National Geographic Channel HD Europe + National Geographic Danmark + National Geographic Wild Europe + Nickelodeon Danmark + Nick Jr Scandinavia + Nicktoons Scandinavia + NRK1 + Paramount Network Danmark + SF-kanalen + Sky News International + SVT 1 + TV 2 + TV 2 Charlie + TV 2 Fri + TV 2 News + TV 2 Sport + TV 2 Zulu + TV 3 Danmark + TV 3 Max + TV 3 Puls + TV 3 Sport + TV 4 + V Film Action + V Film Family + V Film Hits + V Film Premiere + Viasat Explore + Viasat History HD + Viasat Nature + V Series + V Sport Golf + V Sport Ultra HD + Xee \ No newline at end of file From f638d202c95afcd8bec0b99ccc90e016a4f8d873 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 1 Feb 2022 04:05:01 +0300 Subject: [PATCH 4/6] Update allente.se_fi.channels.xml --- sites/allente.se/allente.se_fi.channels.xml | 72 ++++++++++----------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/sites/allente.se/allente.se_fi.channels.xml b/sites/allente.se/allente.se_fi.channels.xml index 719c556b..f1523b78 100644 --- a/sites/allente.se/allente.se_fi.channels.xml +++ b/sites/allente.se/allente.se_fi.channels.xml @@ -1,41 +1,41 @@ - Boomerang Nordic - Cartoon Network Nordic - CNBC Europe - CNN International Europe - Disney Channel Scandinavia - Disney Junior Scandinavia - E! Europe - MTV 00s - MTV Nordic - National Geographic Channel HD Europe - National Geographic Scandinavia - National Geographic Wild Europe - Nick Jr Scandinavia - TV 3 Sverige - TV 6 Sverige - V Film Action - V Film Family - V Film Hits - V Film Premiere - Viasat Explore - Viasat History HD - Viasat Nature - V Sport 1 Suomi - V Sport 1 Sverige - V Sport 2 Suomi - V Sport Football - V Sport Golf - V Sport Live 1 - V Sport Live 2 - V Sport Live 3 - V Sport Live 4 - V Sport Live 5 - V Sport + Suomi - V Sport Premium - V Sport Ultra HD - V Sport Vinter + Boomerang Nordic + Cartoon Network Nordic + CNBC Europe + CNN International Europe + Disney Channel Scandinavia + Disney Junior Scandinavia + E! Europe + MTV 00s + MTV Nordic + National Geographic Channel HD Europe + National Geographic Scandinavia + National Geographic Wild Europe + Nick Jr Scandinavia + TV 3 Sverige + TV 6 Sverige + V Film Action + V Film Family + V Film Hits + V Film Premiere + Viasat Explore + Viasat History HD + Viasat Nature + V Sport 1 Suomi + V Sport 1 Sverige + V Sport 2 Suomi + V Sport Football + V Sport Golf + V Sport Live 1 + V Sport Live 2 + V Sport Live 3 + V Sport Live 4 + V Sport Live 5 + V Sport + Suomi + V Sport Premium + V Sport Ultra HD + V Sport Vinter \ No newline at end of file From 4d44100b87a0ba8c5d8ac22f2c74821c9d212019 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 1 Feb 2022 04:05:05 +0300 Subject: [PATCH 5/6] Update allente.se_no.channels.xml --- sites/allente.se/allente.se_no.channels.xml | 142 ++++++++++---------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/sites/allente.se/allente.se_no.channels.xml b/sites/allente.se/allente.se_no.channels.xml index 12c25e9c..0febe7a9 100644 --- a/sites/allente.se/allente.se_no.channels.xml +++ b/sites/allente.se/allente.se_no.channels.xml @@ -1,76 +1,76 @@ - Aljazeera English - BBC World News Europe - Cartoon Network Nordic - CNBC Europe - CNN International Europe - Discovery Channel Norge - Disney Channel Scandinavia - Disney Junior Scandinavia - DR 2 - E! Europe - EuroNews English - Eurosport 1 Norge - Eurosport Norge - FEM - Kunskapskanalen - Matkanalen - Max - MTV 00s - MTV 80s - MTV Hits Europe - MTV Nordic - National Geographic Channel HD Europe - National Geographic Norge - National Geographic Wild Europe - NFL Network - Nickelodeon Norge - Nick Jr Scandinavia - Nicktoons Scandinavia - NRK1 - NRK2 - NRK3 - Sky News International - SVT 1 - SVT 2 - SVT 24 - SVT Barn - TV 2 - TV 2 - TV 2 Livsstil - TV 2 Nyhetskanalen - TV 2 Sport 1 - TV 2 Sport 2 - TV 2 Sport Premium - TV 2 Zebra - TV 3 Danmark - TV 3 Norge - TV 3 Sverige - TV 6 Norge - TV 6 Sverige - TV Norge - V 4 - V Film Action - V Film Family - V Film Hits - V Film Premiere - Viasat Explore - Viasat History HD - Viasat Nature - Vox - V Series - V Sport 1 Norge - V Sport 2 - V Sport 3 - V Sport Golf - V Sport Live 1 - V Sport Live 2 - V Sport Live 3 - V Sport Live 4 - V Sport Live 5 - V Sport + - V Sport Ultra HD + Aljazeera English + BBC World News Europe + Cartoon Network Nordic + CNBC Europe + CNN International Europe + Discovery Channel Norge + Disney Channel Scandinavia + Disney Junior Scandinavia + DR 2 + E! Europe + EuroNews English + Eurosport 1 Norge + Eurosport Norge + FEM + Kunskapskanalen + Matkanalen + Max + MTV 00s + MTV 80s + MTV Hits Europe + MTV Nordic + National Geographic Channel HD Europe + National Geographic Norge + National Geographic Wild Europe + NFL Network + Nickelodeon Norge + Nick Jr Scandinavia + Nicktoons Scandinavia + NRK1 + NRK2 + NRK3 + Sky News International + SVT 1 + SVT 2 + SVT 24 + SVT Barn + TV 2 + TV 2 + TV 2 Livsstil + TV 2 Nyhetskanalen + TV 2 Sport 1 + TV 2 Sport 2 + TV 2 Sport Premium + TV 2 Zebra + TV 3 Danmark + TV 3 Norge + TV 3 Sverige + TV 6 Norge + TV 6 Sverige + TV Norge + V 4 + V Film Action + V Film Family + V Film Hits + V Film Premiere + Viasat Explore + Viasat History HD + Viasat Nature + Vox + V Series + V Sport 1 Norge + V Sport 2 + V Sport 3 + V Sport Golf + V Sport Live 1 + V Sport Live 2 + V Sport Live 3 + V Sport Live 4 + V Sport Live 5 + V Sport + + V Sport Ultra HD \ No newline at end of file From ac5bbacdebd933488cf70e531f9a9d1d739dd52b Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 1 Feb 2022 04:05:08 +0300 Subject: [PATCH 6/6] Update allente.se_se.channels.xml --- sites/allente.se/allente.se_se.channels.xml | 178 ++++++++++---------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/sites/allente.se/allente.se_se.channels.xml b/sites/allente.se/allente.se_se.channels.xml index b95b7c6c..aa20d03d 100644 --- a/sites/allente.se/allente.se_se.channels.xml +++ b/sites/allente.se/allente.se_se.channels.xml @@ -1,94 +1,94 @@ - Aljazeera English - ATG Live - BBC World News Europe - Boomerang Nordic - Cartoon Network Nordic - C More First - C More Fotboll - C More Golf - C More Hits - C More Hockey - C More Live - C More Live 2 - C More Live 3 - C More Live 4 - C More Series - C More Stars - CNBC Europe - CNN International Europe - Discovery Channel Sverige - Disney Channel Scandinavia - Disney Junior Scandinavia - DR 1 - DR 2 - DR Ramasjang - E! Europe - EuroNews English - Eurosport 1 Sverige - Eurosport 2 Sverige - Godare - God TV Scandinavia - History Sverige - Horse & Country TV Sverige - Kanal 5 - Kanal 9 - Kanal 11 - Kunskapskanalen - MTV 00s - MTV Hits Europe - MTV Nordic - National Geographic Channel HD Europe - National Geographic Scandinavia - National Geographic Wild Europe - NFL Network - Nickelodeon Sverige - Nick Jr Scandinavia - Nicktoons Scandinavia - NRK1 - NRK2 - NRK3 - Paramount Network Sverige - SF-kanalen - Sjuan - Sky News International - Sportkanalen - SVT 1 - SVT 2 - SVT 24 - SVT Barn - TV 2 - TV 3 Sverige - TV 4 - TV 4 Fakta - TV 4 Film - TV 4 Guld - TV 6 Sverige - TV 8 Sverige - TV 10 - TV 12 - V Film Action - V Film Family - V Film Hits - V Film Premiere - Viasat Explore - Viasat History HD - Viasat Nature - V Series - V Sport 1 Sverige - V Sport Extra - V Sport Football - V Sport Golf - V Sport Live 1 - V Sport Live 2 - V Sport Live 3 - V Sport Live 4 - V Sport Live 5 - V Sport Motor - V Sport Premium - V Sport Ultra HD - V Sport Vinter + Aljazeera English + ATG Live + BBC World News Europe + Boomerang Nordic + Cartoon Network Nordic + C More First + C More Fotboll + C More Golf + C More Hits + C More Hockey + C More Live + C More Live 2 + C More Live 3 + C More Live 4 + C More Series + C More Stars + CNBC Europe + CNN International Europe + Discovery Channel Sverige + Disney Channel Scandinavia + Disney Junior Scandinavia + DR 1 + DR 2 + DR Ramasjang + E! Europe + EuroNews English + Eurosport 1 Sverige + Eurosport 2 Sverige + Godare + God TV Scandinavia + History Sverige + Horse & Country TV Sverige + Kanal 5 + Kanal 9 + Kanal 11 + Kunskapskanalen + MTV 00s + MTV Hits Europe + MTV Nordic + National Geographic Channel HD Europe + National Geographic Scandinavia + National Geographic Wild Europe + NFL Network + Nickelodeon Sverige + Nick Jr Scandinavia + Nicktoons Scandinavia + NRK1 + NRK2 + NRK3 + Paramount Network Sverige + SF-kanalen + Sjuan + Sky News International + Sportkanalen + SVT 1 + SVT 2 + SVT 24 + SVT Barn + TV 2 + TV 3 Sverige + TV 4 + TV 4 Fakta + TV 4 Film + TV 4 Guld + TV 6 Sverige + TV 8 Sverige + TV 10 + TV 12 + V Film Action + V Film Family + V Film Hits + V Film Premiere + Viasat Explore + Viasat History HD + Viasat Nature + V Series + V Sport 1 Sverige + V Sport Extra + V Sport Football + V Sport Golf + V Sport Live 1 + V Sport Live 2 + V Sport Live 3 + V Sport Live 4 + V Sport Live 5 + V Sport Motor + V Sport Premium + V Sport Ultra HD + V Sport Vinter