From e7d8099864e19e536746547366b783e7c6be73b8 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Wed, 24 Nov 2021 19:51:46 +0300 Subject: [PATCH 1/3] Create arianatelevision.com.test.js --- .../arianatelevision.com.test.js | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 sites/arianatelevision.com/arianatelevision.com.test.js diff --git a/sites/arianatelevision.com/arianatelevision.com.test.js b/sites/arianatelevision.com/arianatelevision.com.test.js new file mode 100644 index 00000000..bae68802 --- /dev/null +++ b/sites/arianatelevision.com/arianatelevision.com.test.js @@ -0,0 +1,66 @@ +// npx epg-grabber --config=sites/arianatelevision.com/arianatelevision.com.config.js --channels=sites/arianatelevision.com/arianatelevision.com_af.channels.xml --output=.gh-pages/guides/af/arianatelevision.com.epg.xml --days=2 + +const { parser, url, logo } = require('./arianatelevision.com.config.js') +const dayjs = require('dayjs') +const utc = require('dayjs/plugin/utc') +const customParseFormat = require('dayjs/plugin/customParseFormat') +dayjs.extend(customParseFormat) +dayjs.extend(utc) + +const date = dayjs.utc('2021-11-27', 'YYYY-MM-DD').startOf('d') +const channel = { + site_id: '#', + xmltv_id: 'ArianaTVNational.af', + logo: 'https://www.arianatelevision.com/wp-content/uploads/2017/08/logo-atn-new.png' +} + +it('can generate valid url', () => { + expect(url).toBe('https://www.arianatelevision.com/program-schedule/') +}) + +it('can generate valid logo url', () => { + expect(logo({ channel })).toBe( + 'https://www.arianatelevision.com/wp-content/uploads/2017/08/logo-atn-new.png' + ) +}) + +it('can parse response', () => { + const content = `` + const result = parser({ content, date }).map(p => { + p.start = p.start.toJSON() + p.stop = p.stop.toJSON() + return p + }) + + expect(result).toMatchObject([ + { + start: '2021-11-27T02:30:00.000Z', + stop: '2021-11-27T03:00:00.000Z', + title: `City Report` + }, + { + start: '2021-11-27T03:00:00.000Z', + stop: '2021-11-27T10:30:00.000Z', + title: `ICC T20 Highlights` + }, + { + start: '2021-11-27T10:30:00.000Z', + stop: '2021-11-28T02:00:00.000Z', + title: `ICC T20 World Cup` + }, + { + start: '2021-11-28T02:00:00.000Z', + stop: '2021-11-28T02:30:00.000Z', + title: `Quran and Hadis` + } + ]) +}) + +it('can handle empty guide', () => { + const result = parser({ + date, + channel, + content: `` + }) + expect(result).toMatchObject([]) +}) From 089bd82978d72be7f3b32ea58c66736b6dadedd5 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Wed, 24 Nov 2021 19:51:50 +0300 Subject: [PATCH 2/3] Update arianatelevision.com.config.js --- .../arianatelevision.com.config.js | 54 +++++++++++-------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/sites/arianatelevision.com/arianatelevision.com.config.js b/sites/arianatelevision.com/arianatelevision.com.config.js index 75d9aff2..5134e41e 100644 --- a/sites/arianatelevision.com/arianatelevision.com.config.js +++ b/sites/arianatelevision.com/arianatelevision.com.config.js @@ -1,10 +1,8 @@ -const jsdom = require('jsdom') -const { JSDOM } = jsdom +const cheerio = require('cheerio') const dayjs = require('dayjs') const utc = require('dayjs/plugin/utc') const timezone = require('dayjs/plugin/timezone') const customParseFormat = require('dayjs/plugin/customParseFormat') -const tabletojson = require('tabletojson').Tabletojson dayjs.extend(utc) dayjs.extend(timezone) @@ -12,25 +10,26 @@ dayjs.extend(customParseFormat) module.exports = { site: 'arianatelevision.com', - url() { - return `https://www.arianatelevision.com/program-schedule/` + url: `https://www.arianatelevision.com/program-schedule/`, + logo({ channel }) { + return channel.logo }, parser({ content, date }) { - let PM = false const programs = [] const items = parseItems(content, date) items.forEach(item => { - const title = item.title + const prev = programs[programs.length - 1] let start = parseStart(item, date) - if (start.hour() > 11) PM = true - if (start.hour() < 12 && PM) start = start.add(1, 'd') - const stop = start.add(30, 'm') - if (programs.length) { - programs[programs.length - 1].stop = start + if (prev) { + if (start.isBefore(prev.start)) { + start = start.add(1, 'd') + date = date.add(1, 'd') + } + prev.stop = start } - + const stop = start.add(30, 'm') programs.push({ - title, + title: item.title, start, stop }) @@ -48,12 +47,25 @@ function parseStart(item, date) { function parseItems(content, date) { const items = [] - const dom = new JSDOM(content) - const dayOfWeek = date.format('dddd') - const el = dom.window.document.getElementById('jtrt_table_508') - const data = tabletojson.convert(el.outerHTML) - if (!data) return items - const rows = data[0] + const col = date.day() + const $ = cheerio.load(content) + const settings = $('#jtrt_table_settings_508').text() + if (!settings) return [] + const data = JSON.parse(settings) + if (!data || !Array.isArray(data)) return [] - return rows.map(r => ({ start: r.Start, title: r[dayOfWeek] })).filter(i => i.start) + let rows = data[0] + rows.shift() + const output = [] + rows.forEach(row => { + let day = date.day() + 2 + if (day > 7) day = 1 + if (!row[0] || !row[day]) return + output.push({ + start: row[0].trim(), + title: row[day].trim() + }) + }) + + return output } From c21c478b0bae9471cbbf5e39b4827eee1478555e Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Wed, 24 Nov 2021 19:51:57 +0300 Subject: [PATCH 3/3] Update arianatelevision.com_af.channels.xml --- sites/arianatelevision.com/arianatelevision.com_af.channels.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/arianatelevision.com/arianatelevision.com_af.channels.xml b/sites/arianatelevision.com/arianatelevision.com_af.channels.xml index 8f8aaaf0..83a1f8ab 100644 --- a/sites/arianatelevision.com/arianatelevision.com_af.channels.xml +++ b/sites/arianatelevision.com/arianatelevision.com_af.channels.xml @@ -1,6 +1,6 @@ - Ariana TV National + Ariana TV National \ No newline at end of file