From d69f78089535ef49fd0ed14559cd69aaaf12dc3c Mon Sep 17 00:00:00 2001 From: RevGear <95308545+RevGear@users.noreply.github.com> Date: Mon, 29 Aug 2022 10:39:33 +0100 Subject: [PATCH] Update URL/parser for astro.com.my --- sites/astro.com.my/astro.com.my.config.js | 35 ++++++++----------- sites/astro.com.my/astro.com.my.test.js | 41 +++++++++++++++++++++++ 2 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 sites/astro.com.my/astro.com.my.test.js diff --git a/sites/astro.com.my/astro.com.my.config.js b/sites/astro.com.my/astro.com.my.config.js index f75d2ab2..da05dc49 100644 --- a/sites/astro.com.my/astro.com.my.config.js +++ b/sites/astro.com.my/astro.com.my.config.js @@ -2,36 +2,29 @@ const dayjs = require('dayjs') const utc = require('dayjs/plugin/utc') dayjs.extend(utc) - module.exports = { site: 'astro.com.my', - url: function ({ date, channel }) { - return `http://ams-api.astro.com.my/ams/v3/getEvents?periodStart=${date.format( - 'YYYY-MM-DD' - )}:00:00:00&periodEnd=${date.format('YYYY-MM-DD')}:23:59:59&channelId=${channel.site_id}` + url: function ({ channel }) { + return `https://contenthub-api.eco.astro.com.my/channel/${channel.site_id}.json` }, parser: function ({ content }) { const programs = [] const data = JSON.parse(content) - const items = data.getevent - if (!items.length) return programs + const schedules = data.response.schedule - items.forEach(item => { - if (item.programmeTitle && item.displayDateTimeUtc && item.displayDuration) { - const start = dayjs.utc(item.displayDateTimeUtc) - const duration = parseDuration(item.displayDuration) - const stop = start.add(duration, 's') - programs.push({ - title: item.programmeTitle, - description: item.shortSynopsis, - category: item.subGenre, - icon: item.epgEventImage, - start: start.toString(), - stop: stop.toString() + for(let items of Object.values(schedules)){ + items.forEach(item => { + const start = dayjs.utc(item.datetimeInUtc) + const duration = parseDuration(item.duration) + const stop = start.add(duration, 's') + programs.push({ + title: item.title, + start: start, + stop: stop + }) }) - } - }) + } return programs } } diff --git a/sites/astro.com.my/astro.com.my.test.js b/sites/astro.com.my/astro.com.my.test.js new file mode 100644 index 00000000..e4fe0327 --- /dev/null +++ b/sites/astro.com.my/astro.com.my.test.js @@ -0,0 +1,41 @@ +const { parser, url } = require('./astro.com.my.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('2022-08-29', 'YYYY-MM-DD').startOf('d') +const channel = { + site_id: '235', + xmltv_id: 'AstroArena.my' +} + +it('can generate valid url', () => { + expect(url({ channel })).toBe( + 'https://contenthub-api.eco.astro.com.my/channel/235.json' + ) +}) + +it('can parse response', () => { + const content = `{"responseCode":200,"responseMessage":"Channel Detail","response":{"schedule":{"2022-08-29":[{"eventId":"40182037","title":"Motor: Cub Prix 2022","programmeId":"KAEQR","episodeId":"KAEQY","datetime":"2022-08-29 00:15:00.0","datetimeInUtc":"2022-08-28 16:15:00.0","duration":"02:25:00","siTrafficKey":"1:10000285:47439431","detailUrl":"/details/Motor-Cub-Prix-2022-1:10000285:47439431"}],"2022-08-30":[{"eventId":"40197573","title":"BWF Kejohanan Dunia 2022","programmeId":"KAGFN","episodeId":"KDGUX","datetime":"2022-08-30 00:00:00.0","datetimeInUtc":"2022-08-29 16:00:00.0","duration":"05:15:00","siTrafficKey":"1:10000285:47489961","detailUrl":"/details/BWF-Kejohanan-Dunia-2022-1:10000285:47489961"}]}}}` + const result = parser({ content }).map(p => { + p.start = p.start.toJSON() + p.stop = p.stop.toJSON() + return p + }) + + + expect(result).toMatchObject([ + { + start: '2022-08-28T16:15:00.000Z', + stop: '2022-08-28T18:40:00.000Z', + title: 'Motor: Cub Prix 2022', + }, + { + start: '2022-08-29T16:00:00.000Z', + stop: '2022-08-29T21:15:00.000Z', + title: 'BWF Kejohanan Dunia 2022', + } + ]) +}) \ No newline at end of file