From 528ac3d7f9f68f7894cd1b33f956f456ae0462bf Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Fri, 11 Mar 2022 01:59:40 +0300 Subject: [PATCH 01/11] Create dstv.com.test.js --- sites/dstv.com/dstv.com.test.js | 78 +++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 sites/dstv.com/dstv.com.test.js diff --git a/sites/dstv.com/dstv.com.test.js b/sites/dstv.com/dstv.com.test.js new file mode 100644 index 00000000..c3a59b1e --- /dev/null +++ b/sites/dstv.com/dstv.com.test.js @@ -0,0 +1,78 @@ +// npm run channels:parse -- --config=./sites/dstv.com/dstv.com.config.js --output=./sites/dstv.com/dstv.com_za.channels.xml --set=country:zaf +// npx epg-grabber --config=sites/dstv.com/dstv.com.config.js --channels=sites/dstv.com/dstv.com_za.channels.xml --output=guide.xml --days=2 + +const { parser, url } = require('./dstv.com.config.js') +const axios = require('axios') +const dayjs = require('dayjs') +const utc = require('dayjs/plugin/utc') +const customParseFormat = require('dayjs/plugin/customParseFormat') +dayjs.extend(customParseFormat) +dayjs.extend(utc) + +jest.mock('axios') + +const date = dayjs.utc('2022-03-11', 'YYYY-MM-DD').startOf('d') +const channel = { + site_id: 'zaf#HDT', + xmltv_id: 'MNetWest.za' +} + +it('can generate valid url', () => { + expect(url({ channel, date })).toBe( + 'https://www.dstv.com/umbraco/api/TvGuide/GetProgrammes?d=2022-03-11&country=zaf' + ) +}) + +it('can parse response', done => { + const content = `{"Total":4483,"Channels":[{"Number":"214","Tag":"S34","Name":"TENNIS","Programmes":[{"Id":"5c5a56e8-9959-4305-ae2f-7cc32ec39f5f","StartTime":"2022-03-11T09:00:00","EndTime":"2022-03-11T09:15:00","Title":"WTA 1000 HL '22: Indian Wells D2 M1"}]},{"Number":"101","Tag":"HDT","Name":"M-Net HD","Programmes":[{"Id":"a6ada4cd-93df-4eaf-bab4-041e2537ed23","StartTime":"2022-03-11T00:10:00","EndTime":"2022-03-11T00:50:00","Title":"Curb Your Enthusiasm"}]}]}` + + axios.get.mockImplementation(url => { + if ( + url === + 'https://www.dstv.com/umbraco/api/TvGuide/GetProgramme?id=a6ada4cd-93df-4eaf-bab4-041e2537ed23' + ) { + return Promise.resolve({ + data: JSON.parse( + `{"Id":"a6ada4cd-93df-4eaf-bab4-041e2537ed23","ChannelTag":"HDT","Channel":"M-Net Domestic HD","EventID":"HDT0000109067787","StartTime":"2022-03-11T00:10:00","EndTime":"2022-03-11T00:50:00","Duration":"00:40:00","Language":"eng","Title":"Curb Your Enthusiasm","Synopsis":"'S11/E6 of 10 - Man Fights Tiny Woman'. A general entertainment channel showcasing the best international content, focusing on scripted drama, comedy and talk.","Rating":"16","MainGenres":["Series"],"SubGenres":["Sitcom","Comedy"],"Items":[{"Key":"Year","Value":"2020"},{"Key":"Source Key ID","Value":"100338770"}],"ThumbnailUri":"https://03mcdecdnimagerepository.blob.core.windows.net/epguideimage/img/21893_curb_your_enthusiam169.jpg"}` + ) + }) + } else { + return Promise.resolve({ data: '' }) + } + }) + + parser({ content, channel }) + .then(result => { + result = result.map(p => { + p.start = p.start.toJSON() + p.stop = p.stop.toJSON() + return p + }) + + expect(result).toMatchObject([ + { + start: '2022-03-11T00:10:00.000Z', + stop: '2022-03-11T00:50:00.000Z', + title: 'Curb Your Enthusiasm', + description: + "'S11/E6 of 10 - Man Fights Tiny Woman'. A general entertainment channel showcasing the best international content, focusing on scripted drama, comedy and talk.", + icon: 'https://03mcdecdnimagerepository.blob.core.windows.net/epguideimage/img/21893_curb_your_enthusiam169.jpg', + category: ['Sitcom', 'Comedy'] + } + ]) + done() + }) + .catch(done) +}) + +it('can handle empty guide', done => { + parser({ + content: `{"Total":0,"Channels":[]}`, + channel + }) + .then(result => { + expect(result).toMatchObject([]) + done() + }) + .catch(done) +}) From 8fc66e06194c666162e447be1d6da87b88613dea Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Fri, 11 Mar 2022 01:59:43 +0300 Subject: [PATCH 02/11] Create dstv.com.config.js --- sites/dstv.com/dstv.com.config.js | 73 +++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 sites/dstv.com/dstv.com.config.js diff --git a/sites/dstv.com/dstv.com.config.js b/sites/dstv.com/dstv.com.config.js new file mode 100644 index 00000000..2ac8f2b7 --- /dev/null +++ b/sites/dstv.com/dstv.com.config.js @@ -0,0 +1,73 @@ +const axios = require('axios') +const dayjs = require('dayjs') +const utc = require('dayjs/plugin/utc') + +dayjs.extend(utc) + +module.exports = { + site: 'dstv.com', + url: function ({ channel, date }) { + const [region] = channel.site_id.split('#') + + return `https://www.dstv.com/umbraco/api/TvGuide/GetProgrammes?d=${date.format( + 'YYYY-MM-DD' + )}&country=${region}` + }, + async parser({ content, channel }) { + let programs = [] + const items = parseItems(content, channel) + for (const item of items) { + const details = await loadProgramDetails(item) + programs.push({ + title: item.Title, + description: details.Synopsis, + icon: details.ThumbnailUri, + category: details.SubGenres, + start: parseStart(item), + stop: parseStop(item) + }) + } + + return programs + }, + async channels({ country }) { + const data = await axios + .get(`https://www.dstv.com/umbraco/api/TvGuide/GetChannels?country=${country}`) + .then(r => r.data) + .catch(console.log) + + return data.Channels.map(item => { + return { + site_id: `${country}#${item.Tag}`, + name: item.Name + } + }) + } +} + +async function loadProgramDetails(item) { + const url = `https://www.dstv.com/umbraco/api/TvGuide/GetProgramme?id=${item.Id}` + + return axios + .get(url) + .then(r => r.data) + .catch(console.error) +} + +function parseStart(item) { + return dayjs.utc(item.StartTime, 'YYYY-MM-DDTHH:mm:ss') +} + +function parseStop(item) { + return dayjs.utc(item.EndTime, 'YYYY-MM-DDTHH:mm:ss') +} + +function parseItems(content, channel) { + const [_, channelId] = channel.site_id.split('#') + const data = JSON.parse(content) + if (!data || !Array.isArray(data.Channels)) return [] + const channelData = data.Channels.find(c => c.Tag === channelId) + if (!channelData || !Array.isArray(channelData.Programmes)) return [] + + return channelData.Programmes +} From 217dece24f5448cc8140e3ab074cc6202669bcf5 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Fri, 11 Mar 2022 01:59:49 +0300 Subject: [PATCH 03/11] Create dstv.com_za.channels.xml --- sites/dstv.com/dstv.com_za.channels.xml | 152 ++++++++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 sites/dstv.com/dstv.com_za.channels.xml diff --git a/sites/dstv.com/dstv.com_za.channels.xml b/sites/dstv.com/dstv.com_za.channels.xml new file mode 100644 index 00000000..3e8b1365 --- /dev/null +++ b/sites/dstv.com/dstv.com_za.channels.xml @@ -0,0 +1,152 @@ + + + + 1 KZN + 1 Magic HD + Africa Magic Epic + Africa Magic Family + Africa Magic Urban + African Easter + Al Jazeera + Bay TV + BBC Brit HD + BBC Earth HD + BBC First HD + BBC Lifestyle + BBC World News + BET + Big Brother Mzansi HD + Bloomberg Television + Business Day + Cape Town TV + Cartoon Network HD + Cbeebies + CBS Justice HD + CBS Reality + CCTV 4 + CGTN News + Channel O HD + CNBC Africa + CNN International HD + Comedy Central + Curiosity Stream + Day Star + Discovery Channel HD + Discovery Family HD + Disney Channel + Disney Junior + Dumisa + Deutsche Welle + E! Entertainment HD + eTV Extra HD + Emmanuel TV + eMovies HD + eMovies Extra HD + eNews Channel Africa + ESPN 2 HD + ESPN HD + eToonz + e.TV HD + EuroNews Africa + FAITH + Fashion One + FliekNet HD + Food Network HD + FOX Life + FOX HD + GauTV + Ginx eSports HD + Home and Garden TV HD + The History Channel HD + Honey + IGNITION + Discovery ID HD + Jim Jam + Kyk NET HD + Kyk NET & Kie HD + KyKNet Nou + Lifetime Entertainment + ME Channel + Mindset + M Movies 1 + M Movies 2 + M Movies 3 + M Movies 3 + M Movies 4 + M Movies 4 + M-Net Movies Men of Action HD + M-Net Plus 1 HD + M-Net HD + Moja Love HD + MTV + MTV base + Mzansi Bioskop + Mzansi Magic HD + Mzansi Music + Mzansi Wethu HD + National Geographic Channel + NatGeo Wild + NDTV 24x7 + Newzroom Afrika + Nickelodeon + NickJr + NickTOONS + NTA I + One Gospel + Parliamentary Service + PBS Kids + Peoples Weather + RAI International + Real Time + ROK + Russia Today + RTPI + SABC 1 HD + SABC 2 HD + SABC 3 HD + SABC News + Sky News + Sound City + Soweto TV + Spice TV + Star Life HD + Studio Universal HD + ACTION + BLITZ + CRICKET + FOOTBALL + GOLF + GRANDSTAND + LA LIGA + MAXIMO 1 + MOTORSPORT + EPL + PSL + RUGBY + TENNIS + VARIETY 1 + VARIETY 2 + VARIETY 3 + VARIETY 4 + TBN + TeleMundo English + TellyTrack + The Home Channel + Discovery TLC HD + TLNovelas + TNT Africa HD + TRACE Africa + Trace Gospel + TRACE URBAN HD + Travel Channel + Tshwane TV + TV5 Monde Afrique + Lesotho TV + Universal TV HD + VIA HD + VUZU HD + WildEarth + WWE + Zee World HD + + From 12cccbb5abe9e35820666f2b8c17c3350c0ab428 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Fri, 11 Mar 2022 02:36:09 +0300 Subject: [PATCH 04/11] Update dstv.com_za.channels.xml --- sites/dstv.com/dstv.com_za.channels.xml | 292 ++++++++++++------------ 1 file changed, 145 insertions(+), 147 deletions(-) diff --git a/sites/dstv.com/dstv.com_za.channels.xml b/sites/dstv.com/dstv.com_za.channels.xml index 3e8b1365..7f4dae35 100644 --- a/sites/dstv.com/dstv.com_za.channels.xml +++ b/sites/dstv.com/dstv.com_za.channels.xml @@ -1,152 +1,150 @@ - 1 KZN - 1 Magic HD - Africa Magic Epic - Africa Magic Family - Africa Magic Urban - African Easter - Al Jazeera - Bay TV - BBC Brit HD - BBC Earth HD - BBC First HD - BBC Lifestyle - BBC World News - BET - Big Brother Mzansi HD - Bloomberg Television - Business Day - Cape Town TV - Cartoon Network HD - Cbeebies - CBS Justice HD - CBS Reality - CCTV 4 - CGTN News - Channel O HD - CNBC Africa - CNN International HD - Comedy Central - Curiosity Stream - Day Star - Discovery Channel HD - Discovery Family HD - Disney Channel - Disney Junior - Dumisa - Deutsche Welle - E! Entertainment HD - eTV Extra HD - Emmanuel TV - eMovies HD - eMovies Extra HD - eNews Channel Africa - ESPN 2 HD - ESPN HD - eToonz - e.TV HD - EuroNews Africa - FAITH - Fashion One - FliekNet HD - Food Network HD - FOX Life - FOX HD - GauTV - Ginx eSports HD - Home and Garden TV HD - The History Channel HD - Honey - IGNITION - Discovery ID HD - Jim Jam - Kyk NET HD - Kyk NET & Kie HD - KyKNet Nou - Lifetime Entertainment - ME Channel - Mindset - M Movies 1 - M Movies 2 - M Movies 3 - M Movies 3 - M Movies 4 - M Movies 4 - M-Net Movies Men of Action HD - M-Net Plus 1 HD - M-Net HD - Moja Love HD - MTV - MTV base - Mzansi Bioskop - Mzansi Magic HD - Mzansi Music - Mzansi Wethu HD - National Geographic Channel - NatGeo Wild - NDTV 24x7 - Newzroom Afrika - Nickelodeon - NickJr - NickTOONS - NTA I - One Gospel - Parliamentary Service - PBS Kids - Peoples Weather - RAI International - Real Time - ROK - Russia Today - RTPI - SABC 1 HD - SABC 2 HD - SABC 3 HD - SABC News - Sky News - Sound City - Soweto TV - Spice TV - Star Life HD - Studio Universal HD - ACTION - BLITZ - CRICKET - FOOTBALL - GOLF - GRANDSTAND - LA LIGA - MAXIMO 1 - MOTORSPORT - EPL - PSL - RUGBY - TENNIS - VARIETY 1 - VARIETY 2 - VARIETY 3 - VARIETY 4 - TBN - TeleMundo English - TellyTrack - The Home Channel - Discovery TLC HD - TLNovelas - TNT Africa HD - TRACE Africa - Trace Gospel - TRACE URBAN HD - Travel Channel - Tshwane TV - TV5 Monde Afrique - Lesotho TV - Universal TV HD - VIA HD - VUZU HD - WildEarth - WWE - Zee World HD + 1 KZN + 1 Magic HD + Africa Magic Epic + Africa Magic Family + Africa Magic Urban + African Easter + Al Jazeera + Bay TV + BBC Brit HD + BBC Earth HD + BBC First HD + BBC Lifestyle + BBC World News + BET + Big Brother Mzansi HD + Bloomberg Television + Business Day + Cape Town TV + Cartoon Network HD + Cbeebies + CBS Justice HD + CBS Reality + CCTV 4 + CGTN News + Channel O HD + CNBC Africa + CNN International HD + Comedy Central + Curiosity Stream + Day Star + Discovery Channel HD + Discovery Family HD + Disney Channel + Disney Junior + Dumisa + Deutsche Welle + E! Entertainment HD + eTV Extra HD + Emmanuel TV + eMovies HD + eMovies Extra HD + eNews Channel Africa + ESPN 2 HD + ESPN HD + eToonz + e.TV HD + EuroNews Africa + FAITH + Fashion One + FliekNet HD + Food Network HD + FOX Life + FOX HD + GauTV + Ginx eSports HD + Home and Garden TV HD + The History Channel HD + Honey + IGNITION + Discovery ID HD + Jim Jam + Kyk NET HD + Kyk NET & Kie HD + KyKNet Nou + Lifetime Entertainment + ME Channel + Mindset + M Movies 1 + M Movies 2 + M Movies 3 + M Movies 4 + M-Net Movies Men of Action HD + M-Net Plus 1 HD + M-Net HD + Moja Love HD + MTV + MTV base + Mzansi Bioskop + Mzansi Magic HD + Mzansi Music + Mzansi Wethu HD + National Geographic Channel + NatGeo Wild + NDTV 24x7 + Newzroom Afrika + Nickelodeon + NickJr + NickTOONS + NTA I + One Gospel + Parliamentary Service + PBS Kids + Peoples Weather + RAI International + Real Time + ROK + Russia Today + RTPI + SABC 1 HD + SABC 2 HD + SABC 3 HD + SABC News + Sky News + Sound City + Soweto TV + Spice TV + Star Life HD + Studio Universal HD + ACTION + BLITZ + CRICKET + FOOTBALL + GOLF + GRANDSTAND + LA LIGA + MAXIMO 1 + MOTORSPORT + EPL + PSL + RUGBY + TENNIS + VARIETY 1 + VARIETY 2 + VARIETY 3 + VARIETY 4 + TBN + TeleMundo English + TellyTrack + The Home Channel + Discovery TLC HD + TLNovelas + TNT Africa HD + TRACE Africa + Trace Gospel + TRACE URBAN HD + Travel Channel + Tshwane TV + TV5 Monde Afrique + Lesotho TV + Universal TV HD + VIA HD + VUZU HD + WildEarth + WWE + Zee World HD From 8483b6e9f5e60983f5dd6da569f894fee8809c3f Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Fri, 11 Mar 2022 02:51:23 +0300 Subject: [PATCH 05/11] Update dstv.com.test.js --- sites/dstv.com/dstv.com.test.js | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sites/dstv.com/dstv.com.test.js b/sites/dstv.com/dstv.com.test.js index c3a59b1e..16a56b27 100644 --- a/sites/dstv.com/dstv.com.test.js +++ b/sites/dstv.com/dstv.com.test.js @@ -1,4 +1,5 @@ // npm run channels:parse -- --config=./sites/dstv.com/dstv.com.config.js --output=./sites/dstv.com/dstv.com_za.channels.xml --set=country:zaf +// npm run channels:parse -- --config=./sites/dstv.com/dstv.com.config.js --output=./sites/dstv.com/dstv.com_ng.channels.xml --set=country:nga // npx epg-grabber --config=sites/dstv.com/dstv.com.config.js --channels=sites/dstv.com/dstv.com_za.channels.xml --output=guide.xml --days=2 const { parser, url } = require('./dstv.com.config.js') @@ -12,14 +13,24 @@ dayjs.extend(utc) jest.mock('axios') const date = dayjs.utc('2022-03-11', 'YYYY-MM-DD').startOf('d') -const channel = { - site_id: 'zaf#HDT', +const channelZA = { + site_id: 'zaf#101', + xmltv_id: 'MNetWest.za' +} +const channelNG = { + site_id: 'nga#101', xmltv_id: 'MNetWest.za' } -it('can generate valid url', () => { - expect(url({ channel, date })).toBe( - 'https://www.dstv.com/umbraco/api/TvGuide/GetProgrammes?d=2022-03-11&country=zaf' +it('can generate valid url for zaf', () => { + expect(url({ channel: channelZA, date })).toBe( + 'https://www.dstv.com/umbraco/api/TvGuide/GetProgrammes?d=2022-03-11&package=&country=zaf' + ) +}) + +it('can generate valid url for nga', () => { + expect(url({ channel: channelNG, date })).toBe( + 'https://www.dstv.com/umbraco/api/TvGuide/GetProgrammes?d=2022-03-11&package=DStv%20Premium&country=nga' ) }) @@ -41,7 +52,7 @@ it('can parse response', done => { } }) - parser({ content, channel }) + parser({ content, channel: channelZA }) .then(result => { result = result.map(p => { p.start = p.start.toJSON() @@ -68,7 +79,7 @@ it('can parse response', done => { it('can handle empty guide', done => { parser({ content: `{"Total":0,"Channels":[]}`, - channel + channel: channelZA }) .then(result => { expect(result).toMatchObject([]) From e4446a09005ae0918282d937fe6a01db8d06999b Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Fri, 11 Mar 2022 02:51:29 +0300 Subject: [PATCH 06/11] Update dstv.com.config.js --- sites/dstv.com/dstv.com.config.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sites/dstv.com/dstv.com.config.js b/sites/dstv.com/dstv.com.config.js index 2ac8f2b7..baca2786 100644 --- a/sites/dstv.com/dstv.com.config.js +++ b/sites/dstv.com/dstv.com.config.js @@ -8,10 +8,11 @@ module.exports = { site: 'dstv.com', url: function ({ channel, date }) { const [region] = channel.site_id.split('#') + const packageName = region === 'nga' ? 'DStv%20Premium' : '' return `https://www.dstv.com/umbraco/api/TvGuide/GetProgrammes?d=${date.format( 'YYYY-MM-DD' - )}&country=${region}` + )}&package=${packageName}&country=${region}` }, async parser({ content, channel }) { let programs = [] @@ -32,13 +33,15 @@ module.exports = { }, async channels({ country }) { const data = await axios - .get(`https://www.dstv.com/umbraco/api/TvGuide/GetChannels?country=${country}`) + .get( + `https://www.dstv.com/umbraco/api/TvGuide/GetProgrammes?d=2022-03-10&package=DStv%20Premium&country=${country}` + ) .then(r => r.data) .catch(console.log) return data.Channels.map(item => { return { - site_id: `${country}#${item.Tag}`, + site_id: `${country}#${item.Number}`, name: item.Name } }) @@ -66,7 +69,7 @@ function parseItems(content, channel) { const [_, channelId] = channel.site_id.split('#') const data = JSON.parse(content) if (!data || !Array.isArray(data.Channels)) return [] - const channelData = data.Channels.find(c => c.Tag === channelId) + const channelData = data.Channels.find(c => c.Number === channelId) if (!channelData || !Array.isArray(channelData.Programmes)) return [] return channelData.Programmes From 1887935d26b3d7f7a3da3f13dc26a6b2978ebc30 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Fri, 11 Mar 2022 13:10:04 +0300 Subject: [PATCH 07/11] Create dstv.com_ng.channels.xml --- sites/dstv.com/dstv.com_ng.channels.xml | 155 ++++++++++++++++++++++++ 1 file changed, 155 insertions(+) create mode 100644 sites/dstv.com/dstv.com_ng.channels.xml diff --git a/sites/dstv.com/dstv.com_ng.channels.xml b/sites/dstv.com/dstv.com_ng.channels.xml new file mode 100644 index 00000000..11f33337 --- /dev/null +++ b/sites/dstv.com/dstv.com_ng.channels.xml @@ -0,0 +1,155 @@ + + + + SS Grandstand Nigeria + SS Tennis Nigeria + SS Football Plus Nigeria + SS Variety 1 Nigeria + SS Variety 2 Nigeria + SS Premier League Nigeria + SS LaLiga Nigeria + SS Variety 3 Nigeria + SS Variety 4 Nigeria + SS Football Nigeria + POP Central + WAP TV + SS Blitz Nigeria + LAGOS TV + TVC News Nigeria + Galaxy TV + Lumen Christi + OGTV + ONMAX + NTA News 24 + NTA 2 + NTA Parliament + Sunna TV + Arewa 24 + Wazobia Max + URBAN TV + AIT + SILVERBIRD + Channels + MiTV + NTA I + M-Net West HD + M-Net Movies 1 West HD + SS Maximo 1 (P) + SS Maximo 2 (P) + Comedy Central + EuroNews + EuroNews French + EuroNews German + Bloomberg Television + Curiosity Channel + CBS Justice + M-Net Movies 3 + M-Net Movies 2 + ESPN 2 HD + CNBC Africa + The History Channel + WWE Channel + Disney Channel + Maisha Magic Plus HD + TLNovelas + Sky News + Universal TV + Africa Magic Showcase HD + Cartoon Network + Lifetime Entertainment + KIX + ROK + NickJr + NickTOONS + TRACE Muzika + BBC Brit + Africa Magic Urban + 1 Magic + CNN International + Discovery TLC HD + BET + MTV + TRACE Mziki + TRACE Naija + Discovery Channel HD + CBS Reality + Da Vinci Kids + Real Time + ROK 2 + Trace Gospel + TNT Africa + AFRO Music English + Boomerang + BBC Lifestyle + Food Network + ESPN + Trace Jama + Disney Junior + Jim Jam + Cbeebies + Deutsche Welle + Studio Universal HD + ROK GH + NatGeo Wild + National Geographic Channel + Newzroom Afrika + Star Life + TeleMundo + Dove TV + PBS Kids + Televista + Trybe + NHK + Africanews + Discovery ID + HIP TV + Africa Magic Hausa + Dominion TV + Cloud Plus + Wasafi TV + Zee World + Africa Magic Yoruba + Citi TV + Joy News + K24 + Plus TV Africa + Nickelodeon + M-Net Movies 4 + Spice TV + SABC News + Sound City + Arise News + Africa Magic Epic + Maisha Magic Bongo + MTV base + eTV Africa + E! Entertainment + Africa Magic Igbo + Africa Magic Family + Day Star + TBN + SBN + CCTV Entertainment – Mandarin Entertainment Channel + China Movie Channel + BBC World News + Zhejiang TV + Phoenix News and Entertainment + NDTV 24x7 + RAI International + TV Mundial (P) + B4U Movies + Eternal Word Television Network + Emmanuel TV + TV5 Monde Afrique + RTPi (P) + Al Jazeera + FAITH + CGTN French + CCTV 4 + CGTN News + CGTN Documentary + ISLAM CHANNEL + Discovery Family HD + Mindset + + From 07d92a41c086652bda200773499c9ddaf5d9ab2f Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Fri, 11 Mar 2022 13:46:01 +0300 Subject: [PATCH 08/11] Update dstv.com_ng.channels.xml --- sites/dstv.com/dstv.com_ng.channels.xml | 299 ++++++++++++------------ 1 file changed, 149 insertions(+), 150 deletions(-) diff --git a/sites/dstv.com/dstv.com_ng.channels.xml b/sites/dstv.com/dstv.com_ng.channels.xml index 11f33337..c7dfb5e2 100644 --- a/sites/dstv.com/dstv.com_ng.channels.xml +++ b/sites/dstv.com/dstv.com_ng.channels.xml @@ -1,155 +1,154 @@ - SS Grandstand Nigeria - SS Tennis Nigeria - SS Football Plus Nigeria - SS Variety 1 Nigeria - SS Variety 2 Nigeria - SS Premier League Nigeria - SS LaLiga Nigeria - SS Variety 3 Nigeria - SS Variety 4 Nigeria - SS Football Nigeria - POP Central - WAP TV - SS Blitz Nigeria - LAGOS TV - TVC News Nigeria - Galaxy TV - Lumen Christi - OGTV - ONMAX - NTA News 24 - NTA 2 - NTA Parliament - Sunna TV - Arewa 24 - Wazobia Max - URBAN TV - AIT - SILVERBIRD - Channels - MiTV - NTA I - M-Net West HD - M-Net Movies 1 West HD - SS Maximo 1 (P) - SS Maximo 2 (P) - Comedy Central - EuroNews - EuroNews French - EuroNews German - Bloomberg Television - Curiosity Channel - CBS Justice - M-Net Movies 3 - M-Net Movies 2 - ESPN 2 HD - CNBC Africa - The History Channel - WWE Channel - Disney Channel - Maisha Magic Plus HD - TLNovelas - Sky News - Universal TV - Africa Magic Showcase HD - Cartoon Network - Lifetime Entertainment - KIX - ROK - NickJr - NickTOONS - TRACE Muzika - BBC Brit - Africa Magic Urban - 1 Magic - CNN International - Discovery TLC HD - BET - MTV - TRACE Mziki - TRACE Naija - Discovery Channel HD - CBS Reality - Da Vinci Kids - Real Time - ROK 2 - Trace Gospel - TNT Africa - AFRO Music English - Boomerang - BBC Lifestyle - Food Network - ESPN - Trace Jama - Disney Junior - Jim Jam - Cbeebies - Deutsche Welle - Studio Universal HD - ROK GH - NatGeo Wild - National Geographic Channel - Newzroom Afrika - Star Life - TeleMundo - Dove TV - PBS Kids - Televista - Trybe - NHK - Africanews - Discovery ID - HIP TV - Africa Magic Hausa - Dominion TV - Cloud Plus - Wasafi TV - Zee World - Africa Magic Yoruba - Citi TV - Joy News - K24 - Plus TV Africa - Nickelodeon - M-Net Movies 4 - Spice TV - SABC News - Sound City - Arise News - Africa Magic Epic - Maisha Magic Bongo - MTV base - eTV Africa - E! Entertainment - Africa Magic Igbo - Africa Magic Family - Day Star - TBN - SBN - CCTV Entertainment – Mandarin Entertainment Channel - China Movie Channel - BBC World News - Zhejiang TV - Phoenix News and Entertainment - NDTV 24x7 - RAI International - TV Mundial (P) - B4U Movies - Eternal Word Television Network - Emmanuel TV - TV5 Monde Afrique - RTPi (P) - Al Jazeera - FAITH - CGTN French - CCTV 4 - CGTN News - CGTN Documentary - ISLAM CHANNEL - Discovery Family HD - Mindset + 1 Magic + Africa Magic Epic + Africa Magic Family + Africa Magic Hausa + Africa Magic Igbo + Africa Magic Showcase HD + Africa Magic Urban + Africa Magic Yoruba + Africanews + AFRO Music English + AIT + Al Jazeera + Arewa 24 + Arise News + B4U Movies + BBC Brit + BBC Lifestyle + BBC World News + BET + Bloomberg Television + Boomerang + Cartoon Network + Cbeebies + CBS Justice + CBS Reality + CCTV 4 + CCTV Entertainment – Mandarin Entertainment Channel + CGTN News + CGTN Documentary + CGTN French + China Movie Channel + Citi TV + CNBC Africa + CNN International + Comedy Central + Curiosity Channel + Da Vinci Kids + Day Star + Discovery Channel HD + Discovery Family HD + Disney Channel + Disney Junior + Dominion TV + Dove TV + Deutsche Welle + E! Entertainment + Emmanuel TV + ESPN 2 HD + ESPN + eTV Africa + EuroNews German + EuroNews + Eternal Word Television Network + FAITH + Food Network + Galaxy TV + HIP TV + The History Channel + TV Mundial (P) + Discovery ID + ISLAM CHANNEL + Jim Jam + Joy News + K24 + KIX + LAGOS TV + Lifetime Entertainment + Lumen Christi + Maisha Magic Bongo + Maisha Magic Plus HD + Mindset + MiTV + M-Net Movies 1 West HD + M-Net Movies 2 + M-Net Movies 3 + M-Net Movies 4 + M-Net West HD + MTV + MTV base + National Geographic Channel + NatGeo Wild + NDTV 24x7 + Newzroom Afrika + NHK + Nickelodeon + NickJr + NickTOONS + NTA 2 + NTA I + NTA News 24 + NTA Parliament + OGTV + ONMAX + PBS Kids + Phoenix News and Entertainment + Cloud Plus + Plus TV Africa + POP Central + RAI International + Real Time + ROK + ROK 2 + ROK GH + RTPi (P) + SABC News + SBN + SILVERBIRD + Sky News + Sound City + Spice TV + Star Life + Studio Universal HD + Sunna TV + SS Blitz Nigeria + SS Football Nigeria + SS Football Plus Nigeria + SS Grandstand Nigeria + SS LaLiga Nigeria + SS Maximo 1 (P) + SS Maximo 2 (P) + SS Premier League Nigeria + SS Tennis Nigeria + SS Variety 1 Nigeria + SS Variety 2 Nigeria + SS Variety 3 Nigeria + SS Variety 4 Nigeria + TBN + TeleMundo + Televista + Discovery TLC HD + TLNovelas + TNT Africa + Trace Gospel + Trace Jama + TRACE Muzika + TRACE Mziki + TRACE Naija + Trybe + TV5 Monde Afrique + EuroNews French + TVC News Nigeria + Universal TV + URBAN TV + WAP TV + Wasafi TV + Wazobia Max + WWE Channel + Zee World + Zhejiang TV From 52d05d38860dad1193b66b3938eda30a20a4ba79 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Fri, 11 Mar 2022 13:50:10 +0300 Subject: [PATCH 09/11] Update dstv.com.test.js --- sites/dstv.com/dstv.com.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/dstv.com/dstv.com.test.js b/sites/dstv.com/dstv.com.test.js index 16a56b27..16b78ded 100644 --- a/sites/dstv.com/dstv.com.test.js +++ b/sites/dstv.com/dstv.com.test.js @@ -1,6 +1,7 @@ // npm run channels:parse -- --config=./sites/dstv.com/dstv.com.config.js --output=./sites/dstv.com/dstv.com_za.channels.xml --set=country:zaf // npm run channels:parse -- --config=./sites/dstv.com/dstv.com.config.js --output=./sites/dstv.com/dstv.com_ng.channels.xml --set=country:nga // npx epg-grabber --config=sites/dstv.com/dstv.com.config.js --channels=sites/dstv.com/dstv.com_za.channels.xml --output=guide.xml --days=2 +// npx epg-grabber --config=sites/dstv.com/dstv.com.config.js --channels=sites/dstv.com/dstv.com_ng.channels.xml --output=guide.xml --days=2 const { parser, url } = require('./dstv.com.config.js') const axios = require('axios') From 877120e17017205835d61d60b3008220db60e7c7 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Fri, 11 Mar 2022 13:51:50 +0300 Subject: [PATCH 10/11] Create dstv.com.yml --- .github/workflows/dstv.com.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/dstv.com.yml diff --git a/.github/workflows/dstv.com.yml b/.github/workflows/dstv.com.yml new file mode 100644 index 00000000..7c94c891 --- /dev/null +++ b/.github/workflows/dstv.com.yml @@ -0,0 +1,17 @@ +name: dstv.com +on: + schedule: + - cron: '0 0 * * *' + workflow_dispatch: + workflow_run: + workflows: [_trigger] + types: + - completed +jobs: + load: + uses: ./.github/workflows/_load.yml + with: + site: ${{github.workflow}} + secrets: + APP_ID: ${{ secrets.APP_ID }} + APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }} From b4d2fced2d336c368cde6923088ab5c42c4e6545 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Fri, 11 Mar 2022 14:11:33 +0300 Subject: [PATCH 11/11] Update dstv.com_ng.channels.xml --- sites/dstv.com/dstv.com_ng.channels.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/dstv.com/dstv.com_ng.channels.xml b/sites/dstv.com/dstv.com_ng.channels.xml index c7dfb5e2..dc51cb34 100644 --- a/sites/dstv.com/dstv.com_ng.channels.xml +++ b/sites/dstv.com/dstv.com_ng.channels.xml @@ -53,6 +53,7 @@ eTV Africa EuroNews German EuroNews + EuroNews French Eternal Word Television Network FAITH Food Network @@ -140,7 +141,6 @@ TRACE Naija Trybe TV5 Monde Afrique - EuroNews French TVC News Nigeria Universal TV URBAN TV